lots of updates
This commit is contained in:
parent
6794105303
commit
eb2692dff9
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1,4 +1,3 @@
|
||||||
.direnv/
|
.direnv/
|
||||||
.luarc.json
|
.luarc.json
|
||||||
home.nix
|
|
||||||
sys.nix
|
sys.nix
|
||||||
|
|
14
flake.in.nix
14
flake.in.nix
|
@ -29,11 +29,10 @@
|
||||||
nix-colors = mkInput "Misterio77/nix-colors";
|
nix-colors = mkInput "Misterio77/nix-colors";
|
||||||
nixpkgs = mkInput "NixOS/nixpkgs/nixos-unstable";
|
nixpkgs = mkInput "NixOS/nixpkgs/nixos-unstable";
|
||||||
nix-super = mkCustomUrl "git+https://git.privatevoid.net/max/nix-super.git";
|
nix-super = mkCustomUrl "git+https://git.privatevoid.net/max/nix-super.git";
|
||||||
nixvim = mkInput "pupbrained/nixvim";
|
nixvim = mkInput "pupbrained/nvim-config";
|
||||||
schizofox = mkInput "schizofox/schizofox";
|
schizofox = mkInput "schizofox/schizofox";
|
||||||
treefmt-nix = mkInput "numtide/treefmt-nix";
|
treefmt-nix = mkInput "numtide/treefmt-nix";
|
||||||
|
|
||||||
home-manager = mkFollowingNixpkgs "nix-community/home-manager";
|
|
||||||
nix-index-database = mkFollowingNixpkgs "nix-community/nix-index-database";
|
nix-index-database = mkFollowingNixpkgs "nix-community/nix-index-database";
|
||||||
snowfall-flake = mkFollowingNixpkgs "snowfallorg/flake";
|
snowfall-flake = mkFollowingNixpkgs "snowfallorg/flake";
|
||||||
snowfall-lib = mkFollowingNixpkgs "snowfallorg/lib/dev";
|
snowfall-lib = mkFollowingNixpkgs "snowfallorg/lib/dev";
|
||||||
|
@ -74,15 +73,6 @@
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
homes.modules = [
|
|
||||||
catppuccin.homeManagerModules.catppuccin
|
|
||||||
chaotic.homeManagerModules.default
|
|
||||||
hyprland.homeManagerModules.default
|
|
||||||
nix-colors.homeManagerModules.default
|
|
||||||
nix-index-database.hmModules.nix-index
|
|
||||||
schizofox.homeManagerModules.default
|
|
||||||
];
|
|
||||||
|
|
||||||
systems.modules.nixos = [
|
systems.modules.nixos = [
|
||||||
agenix.nixosModules.default
|
agenix.nixosModules.default
|
||||||
catppuccin.nixosModules.catppuccin
|
catppuccin.nixosModules.catppuccin
|
||||||
|
@ -97,7 +87,7 @@
|
||||||
git
|
git
|
||||||
nvfetcher
|
nvfetcher
|
||||||
statix
|
statix
|
||||||
(writeScriptBin "build" "nix fmt && nh os switch . -- --impure && nh home switch")
|
(writeScriptBin "build" "nix fmt && nh os switch . -- --impure")
|
||||||
(writeScriptBin "up" "nix flake update")
|
(writeScriptBin "up" "nix flake update")
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
201
flake.lock
201
flake.lock
|
@ -8,11 +8,11 @@
|
||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718371084,
|
"lastModified": 1720546205,
|
||||||
"narHash": "sha256-abpBi61mg0g+lFFU0zY4C6oP6fBwPzbHPKBGw676xsA=",
|
"narHash": "sha256-boCXsjYVxDviyzoEyAk624600f3ZBo/DKtUdvMTpbGY=",
|
||||||
"owner": "ryantm",
|
"owner": "ryantm",
|
||||||
"repo": "agenix",
|
"repo": "agenix",
|
||||||
"rev": "3a56735779db467538fb2e577eda28a9daacaca6",
|
"rev": "de96bd907d5fbc3b14fc33ad37d1b9a3cb15edc6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -21,6 +21,39 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"aquamarine": {
|
||||||
|
"inputs": {
|
||||||
|
"hyprutils": [
|
||||||
|
"hyprland",
|
||||||
|
"hyprutils"
|
||||||
|
],
|
||||||
|
"hyprwayland-scanner": [
|
||||||
|
"hyprland",
|
||||||
|
"hyprwayland-scanner"
|
||||||
|
],
|
||||||
|
"nixpkgs": [
|
||||||
|
"hyprland",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"systems": [
|
||||||
|
"hyprland",
|
||||||
|
"systems"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1722100913,
|
||||||
|
"narHash": "sha256-75Hcx5Zu0f+BeCkZxN1frkYacjbkwgCq+z3doVgr4Hw=",
|
||||||
|
"owner": "hyprwm",
|
||||||
|
"repo": "aquamarine",
|
||||||
|
"rev": "4918e57979bbdbd05aabb20f63e1cb5dc289bcbd",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "hyprwm",
|
||||||
|
"repo": "aquamarine",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"base16-schemes": {
|
"base16-schemes": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
@ -39,11 +72,11 @@
|
||||||
},
|
},
|
||||||
"catppuccin": {
|
"catppuccin": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719311390,
|
"lastModified": 1721784420,
|
||||||
"narHash": "sha256-eP+SydN7alV3ln7a1BrGhDoLVTBa6RaHxYZ9bTHAQIA=",
|
"narHash": "sha256-bgF6fN4Qgk7NErFKGuuqWXcLORsiykTYyqMUFRiAUBY=",
|
||||||
"owner": "catppuccin",
|
"owner": "catppuccin",
|
||||||
"repo": "nix",
|
"repo": "nix",
|
||||||
"rev": "1adbfeb44a54be0ae79eca751ba948a6faa3bb0f",
|
"rev": "8bdb55cc1c13f572b6e4307a3c0d64f1ae286a4f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -63,11 +96,11 @@
|
||||||
"yafas": "yafas"
|
"yafas": "yafas"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719337945,
|
"lastModified": 1722126515,
|
||||||
"narHash": "sha256-huUuEiHzpqex8wiREzXpi8nose3zSFQebOH+eFCIvRQ=",
|
"narHash": "sha256-Pz8/0lFWhoHOReOJwbf4Fbx0ANGWc306QnuUeMR9keU=",
|
||||||
"owner": "chaotic-cx",
|
"owner": "chaotic-cx",
|
||||||
"repo": "nyx",
|
"repo": "nyx",
|
||||||
"rev": "ea7cff23f3f25e1c6958f29f9aa623234a55d52c",
|
"rev": "d11e6cfcb6c09dbb9ae0265cfe7a684bcde02ec6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -650,11 +683,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719180626,
|
"lastModified": 1722067813,
|
||||||
"narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=",
|
"narHash": "sha256-nxpzoKXwn+8RsxpxwD86mtEscOMw64ZD/vGSNWzGMlA=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb",
|
"rev": "975b83ca560d17db51a66cb2b0dc0e44213eab27",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -666,6 +699,8 @@
|
||||||
"home-manager_3": {
|
"home-manager_3": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
|
"nixvim",
|
||||||
|
"nixvim",
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
@ -684,28 +719,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"home-manager_4": {
|
"home-manager_4": {
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixvim",
|
|
||||||
"nixvim",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1719180626,
|
|
||||||
"narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=",
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-community",
|
|
||||||
"repo": "home-manager",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"home-manager_5": {
|
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"schizofox",
|
"schizofox",
|
||||||
|
@ -742,11 +755,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718450675,
|
"lastModified": 1721330371,
|
||||||
"narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=",
|
"narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprcursor",
|
"repo": "hyprcursor",
|
||||||
"rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6",
|
"rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -757,6 +770,7 @@
|
||||||
},
|
},
|
||||||
"hyprland": {
|
"hyprland": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"aquamarine": "aquamarine",
|
||||||
"hyprcursor": "hyprcursor",
|
"hyprcursor": "hyprcursor",
|
||||||
"hyprlang": "hyprlang",
|
"hyprlang": "hyprlang",
|
||||||
"hyprutils": "hyprutils",
|
"hyprutils": "hyprutils",
|
||||||
|
@ -766,11 +780,11 @@
|
||||||
"xdph": "xdph"
|
"xdph": "xdph"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719350558,
|
"lastModified": 1722112981,
|
||||||
"narHash": "sha256-oACeKBS762XSJbN/rz5Y2xPYGzWQHhwDqn+CeODuWsM=",
|
"narHash": "sha256-0tpOoFxpyYwoo9craExTcxx1yroUuSjHTP2+8toM7Qw=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "e4d09aa3a9de9a9e71c10bf4b6800585b3db9a4c",
|
"rev": "bc86afea7e177a7ad4335737417fc0e468698dc4",
|
||||||
"revCount": 4891,
|
"revCount": 5002,
|
||||||
"submodules": true,
|
"submodules": true,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/hyprwm/Hyprland"
|
"url": "https://github.com/hyprwm/Hyprland"
|
||||||
|
@ -798,11 +812,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719318037,
|
"lastModified": 1721668405,
|
||||||
"narHash": "sha256-TnlAcO5K2gkab0mpKurP5Co6eWRycP/KbFqWNS2rsMA=",
|
"narHash": "sha256-ZnIXa+jeMXoerhRz/ZJwVoYHaROjcLyQsr1b6JZ2AjQ=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprland-plugins",
|
"repo": "hyprland-plugins",
|
||||||
"rev": "3ae670253a5a3ae1e3a3104fb732a8c990a31487",
|
"rev": "4c2cef8326711fbd91b7a313f095545eb50d2a57",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -825,11 +839,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1714869498,
|
"lastModified": 1718746314,
|
||||||
"narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=",
|
"narHash": "sha256-HUklK5u86w2Yh9dOkk4FdsL8eehcOZ95jPhLixGDRQY=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprland-protocols",
|
"repo": "hyprland-protocols",
|
||||||
"rev": "e06482e0e611130cd1929f75e8c1cf679e57d161",
|
"rev": "1b61f0093afff20ab44d88ad707aed8bf2215290",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -854,11 +868,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1717881852,
|
"lastModified": 1721324361,
|
||||||
"narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=",
|
"narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprlang",
|
"repo": "hyprlang",
|
||||||
"rev": "ec6938c66253429192274d612912649a0cfe4d28",
|
"rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -879,11 +893,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719316102,
|
"lastModified": 1722098849,
|
||||||
"narHash": "sha256-dmRz128j/lJmMuTYeCYPfSBRHHQO3VeH4PbmoyAhHzw=",
|
"narHash": "sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu+xHxIVtSN+KkWZYvvVs=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprutils",
|
"repo": "hyprutils",
|
||||||
"rev": "1f6bbec5954f623ff8d68e567bddcce97cd2f085",
|
"rev": "5dcbbc1e3de40b2cecfd2007434d86e924468f1f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -904,11 +918,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719067853,
|
"lastModified": 1721324119,
|
||||||
"narHash": "sha256-mAnZG/eQy72Fp1ImGtqCgUrDumnR1rMZv2E/zgP4U74=",
|
"narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "hyprwayland-scanner",
|
"repo": "hyprwayland-scanner",
|
||||||
"rev": "914f083741e694092ee60a39d31f693d0a6dc734",
|
"rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -941,11 +955,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719292813,
|
"lastModified": 1721993749,
|
||||||
"narHash": "sha256-6w/buoRKo4ijH9O4D/0KjNtiWjtrJebuV7djTEEa0+k=",
|
"narHash": "sha256-dGqEQ68GNGmA8+HHzHEqAcW2uGu/AX+sRWcMO99UM8s=",
|
||||||
"owner": "Jovian-Experiments",
|
"owner": "Jovian-Experiments",
|
||||||
"repo": "Jovian-NixOS",
|
"repo": "Jovian-NixOS",
|
||||||
"rev": "d6222e7818aa5528f8369afe84bc53556a57c329",
|
"rev": "3bd059992912139d6a12e86ba418f933ec368ef2",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1041,11 +1055,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719111455,
|
"lastModified": 1722136042,
|
||||||
"narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=",
|
"narHash": "sha256-x3FmT4QSyK28itMiR5zfYhUrG5nY+2dv+AIcKfmSp5A=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6",
|
"rev": "c0ca47e8523b578464014961059999d8eddd4aae",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1186,11 +1200,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_11": {
|
"nixpkgs_11": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1708475490,
|
"lastModified": 1720957393,
|
||||||
"narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=",
|
"narHash": "sha256-oedh2RwpjEa+TNxhg5Je9Ch6d3W1NKi7DbRO1ziHemA=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "0e74ca98a74bc7270d28838369593635a5db3260",
|
"rev": "693bc46d169f5af9c992095736e82c3488bf7dbb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1202,11 +1216,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719075281,
|
"lastModified": 1722062969,
|
||||||
"narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
|
"narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
|
"rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1218,11 +1232,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719075281,
|
"lastModified": 1721924956,
|
||||||
"narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=",
|
"narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af",
|
"rev": "5ad6a14c6bf098e98800b091668718c336effc95",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1250,11 +1264,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719254875,
|
"lastModified": 1722062969,
|
||||||
"narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=",
|
"narHash": "sha256-QOS0ykELUmPbrrUGmegAUlpmUFznDQeR4q7rFhl8eQg=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60",
|
"rev": "b73c2221a46c13557b1b3be9c2070cc42cf01eb3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1282,11 +1296,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_7": {
|
"nixpkgs_7": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719366746,
|
"lastModified": 1719444225,
|
||||||
"narHash": "sha256-lzWQP7WulTNycJjlLGHQYSCDjiz77+1kAFVODWyBdjI=",
|
"narHash": "sha256-tSTqQB0C1D4frFJI0ASXW0OWYHwqwcvLGxh9i9ieL40=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c7221bae0fbcef01eaa896fe661f0cbf7cf9ce0c",
|
"rev": "4c0e0424411ef3bd1f55f5e1025e0934c63bfbff",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1336,16 +1350,16 @@
|
||||||
"treefmt-nix": "treefmt-nix_2"
|
"treefmt-nix": "treefmt-nix_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719373723,
|
"lastModified": 1719450216,
|
||||||
"narHash": "sha256-LPDMHp20wW8QEiSZHcTtiu3XmGwMt0JPD5dLIKqtDfk=",
|
"narHash": "sha256-u/nnOqyS7agFU51JqnWZZmdMP+8NxrvA7bgby081bSU=",
|
||||||
"owner": "pupbrained",
|
"owner": "pupbrained",
|
||||||
"repo": "nixvim",
|
"repo": "nvim-config",
|
||||||
"rev": "dfcc8eeb3ee7c264aaa86835f8b442403ea42a6c",
|
"rev": "6e9c79b8253997c56075f56d291fce35a2ab7095",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "pupbrained",
|
"owner": "pupbrained",
|
||||||
"repo": "nixvim",
|
"repo": "nvim-config",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -1355,17 +1369,17 @@
|
||||||
"flake-compat": "flake-compat_2",
|
"flake-compat": "flake-compat_2",
|
||||||
"flake-parts": "flake-parts_2",
|
"flake-parts": "flake-parts_2",
|
||||||
"git-hooks": "git-hooks",
|
"git-hooks": "git-hooks",
|
||||||
"home-manager": "home-manager_4",
|
"home-manager": "home-manager_3",
|
||||||
"nix-darwin": "nix-darwin",
|
"nix-darwin": "nix-darwin",
|
||||||
"nixpkgs": "nixpkgs_8",
|
"nixpkgs": "nixpkgs_8",
|
||||||
"treefmt-nix": "treefmt-nix"
|
"treefmt-nix": "treefmt-nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719349326,
|
"lastModified": 1719401747,
|
||||||
"narHash": "sha256-siY3ck/6Ey2VyUpzziZ7XreM9h672CHEwTNuSqqnarA=",
|
"narHash": "sha256-GuY035SXf/wv685mhXsHv/syYh3XT9U8ZDdxr1pGgts=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "1a46075dfe8dbbd2c99980b59af7860a1de010db",
|
"rev": "53a9599cc4da4f7557995b8611e5dba831261eef",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1412,7 +1426,6 @@
|
||||||
"catppuccin": "catppuccin",
|
"catppuccin": "catppuccin",
|
||||||
"chaotic": "chaotic",
|
"chaotic": "chaotic",
|
||||||
"flakegen": "flakegen",
|
"flakegen": "flakegen",
|
||||||
"home-manager": "home-manager_3",
|
|
||||||
"hyprland": "hyprland",
|
"hyprland": "hyprland",
|
||||||
"hyprland-plugins": "hyprland-plugins",
|
"hyprland-plugins": "hyprland-plugins",
|
||||||
"impermanence": "impermanence",
|
"impermanence": "impermanence",
|
||||||
|
@ -1431,7 +1444,7 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat_4",
|
"flake-compat": "flake-compat_4",
|
||||||
"flake-parts": "flake-parts_3",
|
"flake-parts": "flake-parts_3",
|
||||||
"home-manager": "home-manager_5",
|
"home-manager": "home-manager_4",
|
||||||
"nixpak": "nixpak",
|
"nixpak": "nixpak",
|
||||||
"nixpkgs": "nixpkgs_10",
|
"nixpkgs": "nixpkgs_10",
|
||||||
"searx-randomizer": "searx-randomizer",
|
"searx-randomizer": "searx-randomizer",
|
||||||
|
@ -1723,11 +1736,11 @@
|
||||||
"nixpkgs": "nixpkgs_11"
|
"nixpkgs": "nixpkgs_11"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1719243788,
|
"lastModified": 1721769617,
|
||||||
"narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=",
|
"narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf",
|
"rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -1753,11 +1766,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1718619174,
|
"lastModified": 1721755049,
|
||||||
"narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=",
|
"narHash": "sha256-O17b38bQnmfxv7It3OnVYx7fp1seEdI7xxnw5vJFv30=",
|
||||||
"owner": "hyprwm",
|
"owner": "hyprwm",
|
||||||
"repo": "xdg-desktop-portal-hyprland",
|
"repo": "xdg-desktop-portal-hyprland",
|
||||||
"rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623",
|
"rev": "5555f467f68ce7cdf1060991c24263073b95e9da",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -6,10 +6,6 @@
|
||||||
catppuccin.url = "github:catppuccin/nix";
|
catppuccin.url = "github:catppuccin/nix";
|
||||||
chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
|
chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
|
||||||
flakegen.url = "github:jorsn/flakegen";
|
flakegen.url = "github:jorsn/flakegen";
|
||||||
home-manager = {
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
url = "github:nix-community/home-manager";
|
|
||||||
};
|
|
||||||
hyprland = {
|
hyprland = {
|
||||||
submodules = true;
|
submodules = true;
|
||||||
type = "git";
|
type = "git";
|
||||||
|
@ -27,7 +23,7 @@
|
||||||
};
|
};
|
||||||
nix-super.url = "git+https://git.privatevoid.net/max/nix-super.git";
|
nix-super.url = "git+https://git.privatevoid.net/max/nix-super.git";
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
nixvim.url = "github:pupbrained/nixvim";
|
nixvim.url = "github:pupbrained/nvim-config";
|
||||||
schizofox.url = "github:schizofox/schizofox";
|
schizofox.url = "github:schizofox/schizofox";
|
||||||
snowfall-flake = {
|
snowfall-flake = {
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
|
@ -35,6 +35,7 @@ with pkgs; {
|
||||||
}
|
}
|
||||||
1
|
1
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
cliphist list | gawk "$prog"
|
cliphist list | gawk "$prog"
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
@ -84,7 +85,7 @@ with pkgs; {
|
||||||
device = [
|
device = [
|
||||||
{
|
{
|
||||||
name = "logitech-usb-receiver";
|
name = "logitech-usb-receiver";
|
||||||
sensitivity = -0.4;
|
sensitivity = -0.5;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -123,7 +124,15 @@ with pkgs; {
|
||||||
};
|
};
|
||||||
|
|
||||||
exec-once = [
|
exec-once = [
|
||||||
"${mpvpaper}/bin/mpvpaper -vp -o 'no-audio loop' DP-1 ${builtins.toString ./wall.mp4}"
|
"${mpvpaper.overrideAttrs {
|
||||||
|
version = "unstable-2024-07-05";
|
||||||
|
src = fetchFromGitHub {
|
||||||
|
owner = "GhostNaN";
|
||||||
|
repo = "mpvpaper";
|
||||||
|
rev = "a445391ff7491053fef78e3645eeed934f0c8fae";
|
||||||
|
sha256 = "sha256-3wHsUtIkh765EiMnx3BPzztvffIDf1NCqF0I/OATTZ4=";
|
||||||
|
};
|
||||||
|
}}/bin/mpvpaper -vp -o 'no-audio loop' DP-1 ${builtins.toString ./wall.mp4}"
|
||||||
"waybar"
|
"waybar"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
@ -202,6 +211,16 @@ with pkgs; {
|
||||||
"${modC}, j, resizeactive, 0 30"
|
"${modC}, j, resizeactive, 0 30"
|
||||||
"${modC}, k, resizeactive, 0 -30"
|
"${modC}, k, resizeactive, 0 -30"
|
||||||
"${modC}, l, resizeactive, 30 0"
|
"${modC}, l, resizeactive, 30 0"
|
||||||
|
|
||||||
|
# Volume controls
|
||||||
|
", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
|
||||||
|
", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
|
||||||
|
", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
|
||||||
|
|
||||||
|
# Media controls
|
||||||
|
", XF86AudioPlay, exec, playerctl play-pause"
|
||||||
|
", XF86AudioNext, exec, playerctl next"
|
||||||
|
", XF86AudioPrev, exec, playerctl previous"
|
||||||
]
|
]
|
||||||
++ (
|
++ (
|
||||||
builtins.concatLists (builtins.genList (
|
builtins.concatLists (builtins.genList (
|
||||||
|
|
|
@ -63,9 +63,9 @@ in {
|
||||||
rewrite = {
|
rewrite = {
|
||||||
"" = " Desktop";
|
"" = " Desktop";
|
||||||
"(.*) — Firefox Nightly" = " $1";
|
"(.*) — Firefox Nightly" = " $1";
|
||||||
"(.*) - Slack" = " $1";
|
"Slack" = " Slack";
|
||||||
".*?Discord \\| @?(.*)" = " $1";
|
".*?Discord \\| @?(.*)" = " $1";
|
||||||
"WezTerm - (?:\\[.*] ?)?(.*)" = " $1";
|
"wezterm" = " WezTerm";
|
||||||
"Telegram(?: \\((\\d+)\\))?" = " Telegram";
|
"Telegram(?: \\((\\d+)\\))?" = " Telegram";
|
||||||
"Steam" = " Steam";
|
"Steam" = " Steam";
|
||||||
};
|
};
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
local c = wezterm.config_builder()
|
||||||
wezterm.on('user-var-changed', function(window, pane, name, value)
|
wezterm.on('user-var-changed', function(window, pane, name, value)
|
||||||
local overrides = window:get_config_overrides() or {}
|
local overrides = window:get_config_overrides() or {}
|
||||||
if name == "ZEN_MODE" then
|
if name == "ZEN_MODE" then
|
||||||
|
@ -20,7 +21,6 @@ wezterm.on('user-var-changed', function(window, pane, name, value)
|
||||||
end
|
end
|
||||||
window:set_config_overrides(overrides)
|
window:set_config_overrides(overrides)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
wezterm.on('format-window-title', function(tab, pane, tabs, panes, config)
|
wezterm.on('format-window-title', function(tab, pane, tabs, panes, config)
|
||||||
local zoomed = ""
|
local zoomed = ""
|
||||||
|
|
||||||
|
@ -37,8 +37,6 @@ wezterm.on('format-window-title', function(tab, pane, tabs, panes, config)
|
||||||
return 'WezTerm - ' .. zoomed .. index .. tab.active_pane.title
|
return 'WezTerm - ' .. zoomed .. index .. tab.active_pane.title
|
||||||
end)
|
end)
|
||||||
|
|
||||||
local c = wezterm.config_builder()
|
|
||||||
|
|
||||||
wezterm.plugin.require('https://github.com/nekowinston/wezterm-bar').apply_to_config(c, {
|
wezterm.plugin.require('https://github.com/nekowinston/wezterm-bar').apply_to_config(c, {
|
||||||
position = 'bottom',
|
position = 'bottom',
|
||||||
max_width = 32,
|
max_width = 32,
|
||||||
|
|
|
@ -108,6 +108,7 @@ with lib // pkgs // inputs; {
|
||||||
snowfallorg.flake
|
snowfallorg.flake
|
||||||
sound-theme-freedesktop
|
sound-theme-freedesktop
|
||||||
virtio-win
|
virtio-win
|
||||||
|
(warp-terminal.override {waylandSupport = true;})
|
||||||
winetricks
|
winetricks
|
||||||
wineWowPackages.staging
|
wineWowPackages.staging
|
||||||
xclip
|
xclip
|
||||||
|
@ -247,7 +248,6 @@ with lib // pkgs // inputs; {
|
||||||
};
|
};
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
darling.enable = true;
|
|
||||||
dconf.enable = true;
|
dconf.enable = true;
|
||||||
fish.enable = true;
|
fish.enable = true;
|
||||||
gamemode.enable = true;
|
gamemode.enable = true;
|
||||||
|
@ -307,6 +307,7 @@ with lib // pkgs // inputs; {
|
||||||
harfbuzz
|
harfbuzz
|
||||||
icu
|
icu
|
||||||
keyutils.lib
|
keyutils.lib
|
||||||
|
libgcc
|
||||||
libGL
|
libGL
|
||||||
libGLU
|
libGLU
|
||||||
libappindicator-gtk2
|
libappindicator-gtk2
|
||||||
|
@ -394,7 +395,10 @@ with lib // pkgs // inputs; {
|
||||||
networkmanager.enable = true;
|
networkmanager.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
time.timeZone = "America/New_York";
|
time = {
|
||||||
|
hardwareClockInLocalTime = true;
|
||||||
|
timeZone = "America/New_York";
|
||||||
|
};
|
||||||
|
|
||||||
services = {
|
services = {
|
||||||
btrfs.autoScrub.enable = true;
|
btrfs.autoScrub.enable = true;
|
||||||
|
@ -447,6 +451,17 @@ with lib // pkgs // inputs; {
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
snowfallorg.users.marshall = {
|
||||||
|
create = true;
|
||||||
|
admin = true;
|
||||||
|
|
||||||
|
home = {
|
||||||
|
enable = true;
|
||||||
|
|
||||||
|
config = import ./home.nix {inherit lib pkgs inputs;};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
hardware = {
|
hardware = {
|
||||||
bluetooth.enable = true;
|
bluetooth.enable = true;
|
||||||
i2c.enable = true;
|
i2c.enable = true;
|
||||||
|
|
|
@ -1,6 +1,3 @@
|
||||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
|
||||||
# and may be overwritten by future invocations. Please make changes
|
|
||||||
# to /etc/nixos/configuration.nix instead.
|
|
||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
lib,
|
lib,
|
||||||
|
|
|
@ -6,9 +6,19 @@
|
||||||
}: {
|
}: {
|
||||||
colorScheme = inputs.nix-colors.colorSchemes.catppuccin-mocha;
|
colorScheme = inputs.nix-colors.colorSchemes.catppuccin-mocha;
|
||||||
|
|
||||||
|
imports = with inputs; [
|
||||||
|
catppuccin.homeManagerModules.catppuccin
|
||||||
|
chaotic.homeManagerModules.default
|
||||||
|
hyprland.homeManagerModules.default
|
||||||
|
nix-colors.homeManagerModules.default
|
||||||
|
nix-index-database.hmModules.nix-index
|
||||||
|
schizofox.homeManagerModules.default
|
||||||
|
];
|
||||||
|
|
||||||
home = {
|
home = {
|
||||||
packages = with pkgs;
|
packages = with pkgs;
|
||||||
[
|
[
|
||||||
|
alejandra
|
||||||
beeper
|
beeper
|
||||||
duf
|
duf
|
||||||
eternal-terminal
|
eternal-terminal
|
||||||
|
@ -29,7 +39,21 @@
|
||||||
telegram-desktop
|
telegram-desktop
|
||||||
vesktop
|
vesktop
|
||||||
youki
|
youki
|
||||||
|
(pkgs.buildFHSUserEnv {
|
||||||
|
name = "zed";
|
||||||
|
targetPkgs = pkgs:
|
||||||
|
with pkgs; [
|
||||||
|
zed-editor
|
||||||
|
];
|
||||||
|
runScript = "zed";
|
||||||
|
})
|
||||||
]
|
]
|
||||||
|
++ (with jetbrains; [
|
||||||
|
clion
|
||||||
|
rust-rover
|
||||||
|
webstorm
|
||||||
|
idea-ultimate
|
||||||
|
])
|
||||||
++ (with inputs; [
|
++ (with inputs; [
|
||||||
nixvim.packages.${pkgs.system}.default
|
nixvim.packages.${pkgs.system}.default
|
||||||
])
|
])
|
||||||
|
@ -101,6 +125,7 @@
|
||||||
|
|
||||||
qt = {
|
qt = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
platformTheme.name = "kvantum";
|
||||||
style.name = "kvantum";
|
style.name = "kvantum";
|
||||||
style.catppuccin.enable = true;
|
style.catppuccin.enable = true;
|
||||||
};
|
};
|
Loading…
Reference in a new issue