Compare commits

..

No commits in common. "43482d60ddabef56bd4959cdacb861af6f6debe7" and "e95a44d0a69212be77b4a23d690b20f2fc5ca33f" have entirely different histories.

5 changed files with 73 additions and 153 deletions

1
.gitignore vendored
View file

@ -5,4 +5,3 @@ hosts/titan/services/Sharkey/files
hosts/titan/services/Sharkey/db hosts/titan/services/Sharkey/db
hosts/titan/services/Sharkey/redis hosts/titan/services/Sharkey/redis
hosts/hypnos/services/Sharkey/* hosts/hypnos/services/Sharkey/*
users/ultra/#home.nix#

View file

@ -1,38 +1,5 @@
{ {
"nodes": { "nodes": {
"aquamarine": {
"inputs": {
"hyprutils": [
"hyprland",
"hyprutils"
],
"hyprwayland-scanner": [
"hyprland",
"hyprwayland-scanner"
],
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1723405438,
"narHash": "sha256-bpmC2m7OhlDvqgQZdZ2jBLyeIkq/Jld3X4bqRAxBSp8=",
"owner": "hyprwm",
"repo": "aquamarine",
"rev": "9312aa28271c91e5d67ecb9def527b2bbcff0e66",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "aquamarine",
"type": "github"
}
},
"blobs": { "blobs": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -98,11 +65,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1723741945, "lastModified": 1719911417,
"narHash": "sha256-4q55tQohX0RYTqPJyh59FQ5VDb39Ukz3qnXQgFvyNcE=", "narHash": "sha256-1voeH5QpRIxl+JW5eJRYKpYqRQFsKiinMeUJ5ZQCS38=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "45ea19bb0b9b7cbc6ca190ebbb5cff014ca32e1a", "rev": "a84a0ab3a00ec3042de1b7f14e910296970f38a2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -142,11 +109,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1720177068, "lastModified": 1714997157,
"narHash": "sha256-LTSFlW/46hl1u9SzqnvbtNxswCW05bhwOY6CzVEJC5o=", "narHash": "sha256-deabn4fdNmJsDxkT6bgCbwB354sUHvkuq+DcdWBU6B8=",
"owner": "elkowar", "owner": "elkowar",
"repo": "eww", "repo": "eww",
"rev": "4d55e9ad63d1fae887726dffcd25a32def23d34f", "rev": "d1fde927d2799211f791e7ea01cffb667c4f2b60",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -301,11 +268,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1723657484, "lastModified": 1719909389,
"narHash": "sha256-oSxczvhDKCc/ilTPiMz46RmTLhyBoVxhGWhp7Ee54eA=", "narHash": "sha256-d6PZ7WpOV+yb4u4P+8vJ+xmRZbZxiQCpjNnqYoUTBQc=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "ff33b07756548935577aefc15cf48a1beb27b162", "rev": "fc97ecc3e3186b9dfe958869178bdb6b8cd7d8df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -322,11 +289,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723399884, "lastModified": 1719827439,
"narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", "narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "086f619dd991a4d355c07837448244029fc2d9ab", "rev": "59ce796b2563e19821361abbe2067c3bb4143a7d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -342,11 +309,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722636442, "lastModified": 1718476555,
"narHash": "sha256-+7IS0n3/F0I5j6ZbrVlLcIIPHY3o+/vLAqg/G48sG+w=", "narHash": "sha256-fuWpgh8KasByIJWE+xVd37Al0LV5YAn6s871T50qVY0=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "9d67858b437d4a1299be496d371b66fc0d3e01f6", "rev": "29a8374f4b9206d5c4af84aceb7fb5dff441ea60",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -371,11 +338,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722623071, "lastModified": 1718450675,
"narHash": "sha256-sLADpVgebpCBFXkA1FlCXtvEPu1tdEsTfqK1hfeHySE=", "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprcursor", "repo": "hyprcursor",
"rev": "912d56025f03d41b1ad29510c423757b4379eb1c", "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -386,7 +353,6 @@
}, },
"hyprland": { "hyprland": {
"inputs": { "inputs": {
"aquamarine": "aquamarine",
"hyprcursor": "hyprcursor", "hyprcursor": "hyprcursor",
"hyprlang": "hyprlang", "hyprlang": "hyprlang",
"hyprutils": "hyprutils", "hyprutils": "hyprutils",
@ -398,11 +364,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1723738578, "lastModified": 1719786368,
"narHash": "sha256-5thJZNPXwzPAuorW0+0slha1fylbEUHmu0vutXVaARM=", "narHash": "sha256-cXZ+LLf+fe/HUN4oiI+KAydOdbCzx+gJxwG4x5gE9iw=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "12d9901472c6f9128fa8b16c25b3a879d1859e60", "rev": "d7ea1b7785f31e9fd6477490309721a19a835592",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -425,11 +391,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721326555, "lastModified": 1714869498,
"narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=", "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland-protocols", "repo": "hyprland-protocols",
"rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84", "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -454,11 +420,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721324361, "lastModified": 1717881852,
"narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprlang", "repo": "hyprlang",
"rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", "rev": "ec6938c66253429192274d612912649a0cfe4d28",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -479,11 +445,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722869141, "lastModified": 1719316102,
"narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=", "narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "0252fd13e78e60fb0da512a212e56007515a49f7", "rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -504,11 +470,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1721324119, "lastModified": 1719067853,
"narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=", "narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30", "rev": "914f083741e694092ee60a39d31f693d0a6dc734",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -527,11 +493,11 @@
"nixpkgs-24_05": "nixpkgs-24_05" "nixpkgs-24_05": "nixpkgs-24_05"
}, },
"locked": { "locked": {
"lastModified": 1722877200, "lastModified": 1718697807,
"narHash": "sha256-qgKDNJXs+od+1UbRy62uk7dYal3h98I4WojfIqMoGcg=", "narHash": "sha256-Enla61WFisytTYbWygPynEbu8vozjeGc6Obkj2GRj7o=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2", "rev": "290a995de5c3d3f08468fa548f0d55ab2efc7b6b",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -547,11 +513,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723753423, "lastModified": 1718355099,
"narHash": "sha256-ULsoflnTS634565jqT1IXwHzISwcphLBq+YJYL7/p/Y=", "narHash": "sha256-o4K6QHBjXrmcYkX9MIw9gZ+DHM3OaEVswswHRX9h8Is=",
"owner": "viperML", "owner": "viperML",
"repo": "nh", "repo": "nh",
"rev": "24d7b24f567ef3345ac267f61579df291e42bd71", "rev": "6fb30a4d490a98d08628ed93a90a9d23820ef9c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -582,11 +548,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1723352546, "lastModified": 1719832725,
"narHash": "sha256-WTIrvp0yV8ODd6lxAq4F7EbrPQv0gscBnyfn559c3k8=", "narHash": "sha256-dr8DkeS74KVNTgi8BE0BiUKALb+EKlMIV86G2xPYO64=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "ec78079a904d7d55e81a0468d764d0fffb50ac06", "rev": "2917972ed34ce292309b3a4976286f8b5c08db27",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -668,11 +634,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1723310128, "lastModified": 1719895800,
"narHash": "sha256-IiH8jG6PpR4h9TxSGMYh+2/gQiJW9MwehFvheSb5rPc=", "narHash": "sha256-xNbjISJTFailxass4LmdWeV4jNhAlmJPwj46a/GxE6M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "c54cf53e022b0b3c1d3b8207aa0f9b194c24f0cf", "rev": "6e253f12b1009053eff5344be5e835f604bb64cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -683,11 +649,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1723637854, "lastModified": 1719690277,
"narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -732,11 +698,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1723752995, "lastModified": 1719911046,
"narHash": "sha256-aEt77V/MIFSWmK4TNtF/ZfoFZtG/jfS3GjOzsupJguA=", "narHash": "sha256-GMHbE8MbUK886x26Y/9uAtutxodlhHwfzDRuC6qLxHA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cd7b30af7979d9942a8ce88de8c9ffecd4cbfcf5", "rev": "8188fcb8f4b2525d89372d044168c6aac458453f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -748,27 +714,27 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1723556749, "lastModified": 1719663039,
"narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=", "narHash": "sha256-tXlrgAQygNIy49LDVFuPXlWD2zTQV9/F8pfoqwwPJyo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4a92571f9207810b559c9eac203d1f4d79830073", "rev": "4a1e673523344f6ccc84b37f4413ad74ea19a119",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.05", "ref": "nixos-23.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1723637854, "lastModified": 1719690277,
"narHash": "sha256-med8+5DSWa2UnOqtdICndjDAEjxr5D7zaIiK4pn0Q7c=", "narHash": "sha256-0xSej1g7eP2kaUF+JQp8jdyNmpmCJKRpO12mKl/36Kc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c3aa7b8938b17aebd2deecf7be0636000d62a2b9", "rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -969,11 +935,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1722365976, "lastModified": 1718619174,
"narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=", "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341", "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -73,7 +73,7 @@ in {
printing.enable = true; printing.enable = true;
openssh.enable = true; openssh.enable = true;
guix = { guix = {
enable = false; enable = true;
stateDir = "/gnu/var"; stateDir = "/gnu/var";
gc = { gc = {
enable = true; enable = true;
@ -86,6 +86,8 @@ in {
}; };
qt.platformTheme = lib.mkForce "gnome"; qt.platformTheme = lib.mkForce "gnome";
# Enable sound with pipewire.
sound.enable = true;
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services.pipewire = {
@ -112,9 +114,9 @@ in {
"dialout" "dialout"
]; ];
packages = with pkgs; [ packages = with pkgs; [
# wezterm wezterm
gradience gradience
gnome-tweaks gnome.gnome-tweaks
alacritty alacritty
dosbox dosbox
newsflash newsflash
@ -124,10 +126,6 @@ in {
floorp floorp
qFlipper qFlipper
remmina remmina
arduino-ide
prusa-slicer
solaar
niri
]; ];
shell = pkgs.zsh; shell = pkgs.zsh;
ignoreShellProgramCheck = true; # I configured zsh with home-manager ignoreShellProgramCheck = true; # I configured zsh with home-manager
@ -154,7 +152,6 @@ in {
gnomeExtensions.clipboard-indicator gnomeExtensions.clipboard-indicator
gnomeExtensions.gsconnect gnomeExtensions.gsconnect
gnomeExtensions.media-controls gnomeExtensions.media-controls
gnomeExtensions.solaar-extension
nerdfonts nerdfonts
everblush everblush
bibata-cursors bibata-cursors

View file

@ -3,7 +3,6 @@
(setq-default indent-tabs-mode nil) (setq-default indent-tabs-mode nil)
(setq-default tab-width 2) (setq-default tab-width 2)
(setq c-basic-offset indent)) (setq c-basic-offset indent))
(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
(load (expand-file-name "~/.quicklisp/slime-helper.el")) (load (expand-file-name "~/.quicklisp/slime-helper.el"))
(setq inferior-lisp-program "sbcl") (setq inferior-lisp-program "sbcl")
(defun font-size-to-height (size) (* 10 size)) (defun font-size-to-height (size) (* 10 size))
@ -19,7 +18,7 @@
; (load (expand-file-name "~/.emacs.d/everblush-theme.el")) ; (load (expand-file-name "~/.emacs.d/everblush-theme.el"))
(load-theme 'uwu) (load-theme 'uwu)
(if (window-system) (if (window-system)
(set-frame-size (selected-frame) 1000 800)) (set-frame-size (selected-frame) 80 20))
;; (add-hook 'c++-mode-hook 'irony-mode) ;; (add-hook 'c++-mode-hook 'irony-mode)
;; (add-hook 'c-mode-hook 'irony-mode) ;; (add-hook 'c-mode-hook 'irony-mode)
;; (add-hook 'irony-mode-hook 'irony-cdb-autosetup-compile-options) ;; (add-hook 'irony-mode-hook 'irony-cdb-autosetup-compile-options)
@ -27,7 +26,7 @@
;(push 'hotfuzz completion-styles) ;(push 'hotfuzz completion-styles)
(setq vertico-cycle t) (setq vertico-cycle nil)
(setq vertico-resize t) (setq vertico-resize t)
(keymap-global-set "C-j" #'vertico-next-group) (keymap-global-set "C-j" #'vertico-next-group)
(keymap-global-set "C-k" #'vertico-previous-group) (keymap-global-set "C-k" #'vertico-previous-group)
@ -116,24 +115,7 @@
(add-hook 'prog-mode-hook 'rainbow-delimiters-mode) (add-hook 'prog-mode-hook 'rainbow-delimiters-mode)
(add-hook 'prog-mode-hook 'rainbow-mode) (add-hook 'prog-mode-hoow 'rainbow-mode)
(add-hook 'eshell-mode-hook #'esh-autosuggest-mode) (add-hook 'eshell-mode-hook #'esh-autosuggest-mode)
;(define-key eshell-mode-map [remap eshell-pcomplete] 'helm-esh-pcomplete) (define-key eshell-mode-map [remap eshell-pcomplete] 'helm-esh-pcomplete)
(dashboard-setup-startup-hook)
(add-hook 'server-after-make-frame-hook #'dashboard-open)
(add-hook 'prog-mode-hook #'sublimity-mode)
(add-hook 'prog-mode-hook #'linum-relative-on)
(add-hook 'prog-mode-hook #'display-line-numbers-mode)
(setq completion-styles '(orderless basic)
completion-category-defaults nil
completion-category-overrides '((file (styles basic partial-completion))))
(setq pulsar-pulse t
pulsar-delay 0.055)

View file

@ -66,13 +66,6 @@ let
steam steam
zone-sl zone-sl
helm helm
dashboard
helpful
sublimity
workgroups2
linum-relative
pulsar
orderless
]; ];
}); });
helix = inputs.helix.packages.${pkgs.system}.default; helix = inputs.helix.packages.${pkgs.system}.default;
@ -267,14 +260,12 @@ in {
clang-tools clang-tools
#emacs-package #emacs-package
dino dino
# cinny-desktop cinny-desktop
(inputs.nix-inst.packages.${pkgs.system}.default) (inputs.nix-inst.packages.${pkgs.system}.default)
dotnet-runtime_6 dotnet-runtime_6
# dotnet-runtime_8
tea tea
thefuck thefuck
playerctl playerctl
# nyxt
]; ];
file = { file = {
"emacs.d/everblush-theme.el".source = ./configs/emacs/everblush-theme.el; "emacs.d/everblush-theme.el".source = ./configs/emacs/everblush-theme.el;
@ -321,19 +312,7 @@ in {
}; };
oh-my-zsh = { oh-my-zsh = {
enable = true; enable = true;
plugins = [ plugins = [ "git" "thefuck" "history-substring-search" "fzf" ];
"git"
"thefuck"
"history-substring-search"
"fzf"
"npm"
"sudo"
"vscode"
"web-search"
"starship"
"git-auto-fetch"
"nmap"
];
theme = "cloud"; theme = "cloud";
}; };
history = { history = {
@ -342,11 +321,8 @@ in {
extended = true; extended = true;
}; };
initExtra = '' initExtra = ''
zmodload zsh/complist
zstyle ':completion:*' menu yes select
bindkey -M menuselect '?' history-incremental-search-forward
eval $(thefuck --alias) eval $(thefuck --alias)
export PATH="$PATH:$HOME/.local/bin" eval $(starship init zsh)
''; '';
zsh-abbr = { zsh-abbr = {
enable = true; enable = true;