Compare commits

..

No commits in common. "a3c3c91699fbd887e0eb1794cfb7135cf1e57bc6" and "a13150440e6d074124c083b5c02d0d8d203452b4" have entirely different histories.

6 changed files with 69 additions and 217 deletions

View file

@ -10,11 +10,11 @@
]
},
"locked": {
"lastModified": 1723635448,
"narHash": "sha256-DitGGbiTNxU/5DP1BmAE68AeyWiyjRVStlUXPMhQqIU=",
"lastModified": 1722532933,
"narHash": "sha256-mlU97SAd7HiAItg+3R1870Igje1iJhQjba7hNQa0T78=",
"owner": "atuinsh",
"repo": "atuin",
"rev": "72a562a38e15e12b39381d435f6977eb938783b0",
"rev": "2ce1a06f9519c7d9ab7f17b036794eff1569925b",
"type": "github"
},
"original": {
@ -72,11 +72,11 @@
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1723530607,
"narHash": "sha256-FaXZZLLDW1D+pj7UgrIslDS8XjMMG3Pus5gAvUYWQS0=",
"lastModified": 1722407091,
"narHash": "sha256-+xR0ZqooQvAjxcpoDBCqiUCKrBK8/RGVffRzlKH7urw=",
"owner": "nix-community",
"repo": "fenix",
"rev": "296d44c440302980824c5f3b67e477cf0522e0c1",
"rev": "0900ff903f376cc822ca637fef58c1ca4f44fab5",
"type": "github"
},
"original": {
@ -172,7 +172,7 @@
},
"flake-utils_2": {
"inputs": {
"systems": "systems_4"
"systems": "systems_2"
},
"locked": {
"lastModified": 1681202837,
@ -190,7 +190,7 @@
},
"flake-utils_3": {
"inputs": {
"systems": "systems_5"
"systems": "systems_3"
},
"locked": {
"lastModified": 1710146030,
@ -208,7 +208,7 @@
},
"flake-utils_4": {
"inputs": {
"systems": "systems_6"
"systems": "systems_4"
},
"locked": {
"lastModified": 1710146030,
@ -241,11 +241,11 @@
]
},
"locked": {
"lastModified": 1724227338,
"narHash": "sha256-TuSaYdhOxeaaE9885mFO1lZHHax33GD5A9dczJrGUjw=",
"lastModified": 1721042469,
"narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "6cedaa7c1b4f82a266e5d30f212273e60d62cb0d",
"rev": "f451c19376071a90d8c58ab1a953c6e9840527fd",
"type": "github"
},
"original": {
@ -307,11 +307,11 @@
]
},
"locked": {
"lastModified": 1723986931,
"narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
"lastModified": 1722462338,
"narHash": "sha256-ss0G8t8RJVDewA3MyqgAlV951cWRK6EtVhVKEZ7J5LU=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
"rev": "6e090576c4824b16e8759ebca3958c5b09659ee8",
"type": "github"
},
"original": {
@ -328,11 +328,11 @@
]
},
"locked": {
"lastModified": 1723986931,
"narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=",
"lastModified": 1722407237,
"narHash": "sha256-wcpVHUc2nBSSgOM7UJSpcRbyus4duREF31xlzHV5T+A=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671",
"rev": "58cef3796271aaeabaed98884d4abaab5d9d162d",
"type": "github"
},
"original": {
@ -341,97 +341,17 @@
"type": "github"
}
},
"hyprcursor": {
"inputs": {
"hyprlang": "hyprlang",
"nixpkgs": [
"mcmojave-hyprcursor",
"nixpkgs"
],
"systems": "systems_2"
},
"locked": {
"lastModified": 1721330371,
"narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=",
"owner": "hyprwm",
"repo": "hyprcursor",
"rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprcursor",
"type": "github"
}
},
"hyprlang": {
"inputs": {
"hyprutils": "hyprutils",
"nixpkgs": [
"mcmojave-hyprcursor",
"hyprcursor",
"nixpkgs"
],
"systems": [
"mcmojave-hyprcursor",
"hyprcursor",
"systems"
]
},
"locked": {
"lastModified": 1721324361,
"narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=",
"owner": "hyprwm",
"repo": "hyprlang",
"rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprlang",
"type": "github"
}
},
"hyprutils": {
"inputs": {
"nixpkgs": [
"mcmojave-hyprcursor",
"hyprcursor",
"hyprlang",
"nixpkgs"
],
"systems": [
"mcmojave-hyprcursor",
"hyprcursor",
"hyprlang",
"systems"
]
},
"locked": {
"lastModified": 1721324102,
"narHash": "sha256-WAZ0X6yJW1hFG6otkHBfyJDKRpNP5stsRqdEuHrFRpk=",
"owner": "hyprwm",
"repo": "hyprutils",
"rev": "962582a090bc233c4de9d9897f46794280288989",
"type": "github"
},
"original": {
"owner": "hyprwm",
"repo": "hyprutils",
"type": "github"
}
},
"kmonad": {
"inputs": {
"nixpkgs": "nixpkgs_3"
},
"locked": {
"dir": "nix",
"lastModified": 1724217668,
"narHash": "sha256-cqeOaZkDdcttgWjlokEXYyokBm3guoOGQUC1lvOurO0=",
"lastModified": 1722406785,
"narHash": "sha256-9M09FN+zOW0QNzM7zqtY0kzvD3GoaPZl4r9NA+fgVrc=",
"owner": "kmonad",
"repo": "kmonad",
"rev": "4c324f1631b3b2f7e17e804b0ed3ac314e57bcb8",
"rev": "840af41fab33829ed03ba932aa017f8912e6fb75",
"type": "github"
},
"original": {
@ -441,28 +361,6 @@
"type": "github"
}
},
"mcmojave-hyprcursor": {
"inputs": {
"hyprcursor": "hyprcursor",
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_3"
},
"locked": {
"lastModified": 1722822648,
"narHash": "sha256-aM3y6Fq156ilzKUPrZTwp+XWmIqcoQeklRERN0Y0Nvo=",
"owner": "libadoxon",
"repo": "mcmojave-hyprcursor",
"rev": "ad4bbde8d87810f74fe72ae102ce824f26bb1b07",
"type": "github"
},
"original": {
"owner": "libadoxon",
"repo": "mcmojave-hyprcursor",
"type": "github"
}
},
"nicks_nextcloud_integrations": {
"inputs": {
"nixpkgs": "nixpkgs_4",
@ -490,11 +388,11 @@
]
},
"locked": {
"lastModified": 1724299755,
"narHash": "sha256-P5zMA17kD9tqiqMuNXwupkM7buM3gMNtoZ1VuJTRDE4=",
"lastModified": 1722082646,
"narHash": "sha256-od8dBWVP/ngg0cuoyEl/w9D+TCNDj6Kh4tr151Aax7w=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "a8968d88e5a537b0491f68ce910749cd870bdbef",
"rev": "0413754b3cdb879ba14f6e96915e5fdf06c6aab6",
"type": "github"
},
"original": {
@ -510,11 +408,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1724065442,
"narHash": "sha256-8ZUoyeO7Q70bLuijVYvToBSkApw9kfc5hMykTGxB64I=",
"lastModified": 1722253092,
"narHash": "sha256-37vyqHPx57deHhwvi4jwyNQLYkhm/rlVTYKOG1iahsc=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "0bec2bfb8a2d4dd16e5b012982ca95e57d50e6a2",
"rev": "f373ad59ae5866f0f98216bd5c71526b373450d2",
"type": "github"
},
"original": {
@ -622,11 +520,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1723688146,
"narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
"lastModified": 1722087241,
"narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
"rev": "8c50662509100d53229d4be607f1a3a31157fa12",
"type": "github"
},
"original": {
@ -638,11 +536,11 @@
},
"nixpkgs_7": {
"locked": {
"lastModified": 1724224976,
"narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
"lastModified": 1722421184,
"narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
"rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58",
"type": "github"
},
"original": {
@ -654,11 +552,11 @@
},
"nixpkgs_8": {
"locked": {
"lastModified": 1724224976,
"narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
"lastModified": 1722185531,
"narHash": "sha256-veKR07psFoJjINLC8RK4DiLniGGMgF3QMlS4tb74S6k=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
"rev": "52ec9ac3b12395ad677e8b62106f0b98c1f8569d",
"type": "github"
},
"original": {
@ -681,11 +579,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1724340365,
"narHash": "sha256-SFJuLI6FpuLHI0PdZAIOAJoeR6Z+cRkbTUQ5TuqJw5s=",
"lastModified": 1722492816,
"narHash": "sha256-aZe7oSm/+GM1whS6bxZy+DJgbcy8rDIkygBA0owCvmU=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "1854d591cb0e5be6ad97f5091766cdf28e948265",
"rev": "820f8d58eafd7121989fea3ae9e71f29699d856b",
"type": "github"
},
"original": {
@ -703,11 +601,11 @@
]
},
"locked": {
"lastModified": 1723969429,
"narHash": "sha256-BuewfNEXEf11MIkJY+uvWsdLu1dIvgJqntWChvNdALg=",
"lastModified": 1722144272,
"narHash": "sha256-olZbfaEdd+zNPuuyYcYGaRzymA9rOmth8yXOlVm+LUs=",
"owner": "NuschtOS",
"repo": "search",
"rev": "a05d1805f2a2bc47d230e5e92aecbf69f784f3d0",
"rev": "16565307c267ec219c2b5d3494ba66df08e7d403",
"type": "github"
},
"original": {
@ -723,7 +621,6 @@
"headscale": "headscale",
"home-manager": "home-manager",
"kmonad": "kmonad",
"mcmojave-hyprcursor": "mcmojave-hyprcursor",
"nicks_nextcloud_integrations": "nicks_nextcloud_integrations",
"nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_7",
@ -735,11 +632,11 @@
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1723473250,
"narHash": "sha256-Ls0e6R4FmGUFXZlUcm6ZQaVNJ4Yj/nua4SSctXIopao=",
"lastModified": 1722337341,
"narHash": "sha256-Myc+UnbLDQccueeO1q5CF0sNiGebQo1N+cdOpDMhNsg=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "32a86cb1dad2b208e8f36f1bb50c2e4806b0371f",
"rev": "4feec4b0c1d5aad7aba34e0397fe7bd984c9a634",
"type": "github"
},
"original": {
@ -803,31 +700,31 @@
},
"systems_2": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"repo": "default",
"type": "github"
}
},
"systems_3": {
"locked": {
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default-linux",
"repo": "default",
"type": "github"
}
},
@ -861,36 +758,6 @@
"type": "github"
}
},
"systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_7": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
@ -899,11 +766,11 @@
]
},
"locked": {
"lastModified": 1723808491,
"narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=",
"lastModified": 1722330636,
"narHash": "sha256-uru7JzOa33YlSRwf9sfXpJG+UAV+bnBEYMjrzKrQZFw=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a",
"rev": "768acdb06968e53aa1ee8de207fd955335c754b7",
"type": "github"
},
"original": {
@ -914,7 +781,7 @@
},
"utils": {
"inputs": {
"systems": "systems_7"
"systems": "systems_5"
},
"locked": {
"lastModified": 1710146030,

View file

@ -11,11 +11,6 @@
nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
mcmojave-hyprcursor = {
url = "github:libadoxon/mcmojave-hyprcursor";
inputs.nixpkgs.follows = "nixpkgs";
};
nixpkgs-stable = {
url = "github:NixOS/nixpkgs/release-23.11";
};
@ -41,7 +36,7 @@
};
};
outputs = {
outputs = inputs@{
self,
nixpkgs,
nixpkgs-stable,
@ -52,7 +47,7 @@
atuin,
nixos-wsl,
...
} @ inputs:
}:
let
user = "nixolas";
system = "x86_64-linux";
@ -102,9 +97,6 @@
# To change username after installing: https://nix-community.github.io/NixOS-WSL/how-to/change-username.html
NicksNixWSL = lib.nixosSystem {
inherit system;
specialArgs = {
inherit inputs;
};
modules = [
nixos-wsl.nixosModules.default
@ -144,7 +136,7 @@
NicksNixLaptop = lib.nixosSystem {
inherit system;
specialArgs = {
inherit user inputs;
inherit user;
};
modules = [
@ -176,7 +168,7 @@
NicksNixDesktop = lib.nixosSystem {
inherit system;
specialArgs = { inherit user inputs; };
specialArgs = { inherit user; };
modules = [
{

View file

@ -69,7 +69,7 @@ let
qalculate-gtk # unit-friendly calculator
pkgs-stable.qlcplus # LED xlr control program
signal-desktop # secure messaging service
# pkgs-stable.vscodium # when vim and emacs (somehow) isn't enough
pkgs-stable.vscodium # when vim and emacs (somehow) isn't enough
obs-studio # for video recording and virtual camera
libsForQt5.kate # kate/kwrite
@ -103,7 +103,7 @@ in
./modules/zsh.nix
./modules/kitty.nix
(if (! builtins.elem osConfig.networking.hostName commandline_only_hosts ) then ./modules/hyprland else null)
#(if (! builtins.elem osConfig.networking.hostName commandline_only_hosts ) then ./modules/discord.nix else null)
(if (! builtins.elem osConfig.networking.hostName commandline_only_hosts ) then ./modules/discord.nix else null)
#./modules/emacs.nix
(if (! builtins.elem osConfig.networking.hostName commandline_only_hosts ) then ./modules/fusuma.nix else null)
(if (! builtins.elem osConfig.networking.hostName commandline_only_hosts ) then ./modules/rofi.nix else null)

View file

@ -15,12 +15,6 @@
WLR_NO_HARDWARE_CURSORS = "1";
};
environment.variables.HYPRCURSOR_THEME = "McMojave";
environment.variables.HYPRCURSOR_SIZE = "32";
environment.systemPackages = [
inputs.mcmojave-hyprcursor.packages.${pkgs.stdenv.hostPlatform.system}.default
];
programs.hyprland.enable = true;
services = {

View file

@ -14,14 +14,13 @@ in
imports = [
../ewwbar
./displays.nix
./keybinds.nix
./window_rules.nix
./keybinds.nix
./displays.nix
];
home.packages = with pkgs; [
swww
hyprcursor
];
wayland.windowManager.hyprland = {

View file

@ -49,8 +49,8 @@ in
"$mod, mouse_down, workspace, e+1"
"$mod, mouse_up, workspace, e-1"
"CTRL_SHIFT, h, exec, ewwtilities prev-next-workspace 0"
"CTRL_SHIFT, l, exec, ewwtilities prev-next-workspace 1"
"CTRL_SHIFT, h, Monitor-respective left-wards workspace switching, ewwtilities prev-next-workspace 0"
"CTRL_SHIFT, l, Monitor-respective right-wards workspace switching, ewwtilities prev-next-workspace 1"
] ++
# Change workspace
(map (n: