cleslie/nixfiles
1
0
Fork 0
mirror of https://github.com/callumio/nixfiles.git synced 2025-12-19 20:39:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: cleslie:1d10befe6138105e9733ee099575b925cac959f9
Branches Tags
cleslie:main
cleslie:update_flake_lock_action
cleslie:dependabot/github_actions/main/DeterminateSystems/update-flake-lock-28
cleslie:dependabot/github_actions/main/actions/checkout-6
cleslie:dependabot/github_actions/main/actions/github-script-8
cleslie:flake-parts
..
compare: cleslie:7dd119992fb4fec1ccb9653e47c925cf2749229e
Branches Tags
cleslie:update_flake_lock_action
cleslie:dependabot/github_actions/main/DeterminateSystems/update-flake-lock-28
cleslie:dependabot/github_actions/main/actions/checkout-6
cleslie:main
cleslie:dependabot/github_actions/main/actions/github-script-8
cleslie:flake-parts

No commits in common. "1d10befe6138105e9733ee099575b925cac959f9" and "7dd119992fb4fec1ccb9653e47c925cf2749229e" have entirely different histories.
1d10befe61 ... 7dd119992f

13 changed files with 404 additions and 357 deletions
Download patch file Download diff file Expand all files Collapse all files

277
flake.lock generated
View file

@ -184,27 +184,6 @@
} }
}, },
"crane": { "crane": {
"inputs": {
"nixpkgs": [
"lanzaboote",
"nixpkgs"
]
},
"locked": {
"lastModified": 1717535930,
"narHash": "sha256-1hZ/txnbd/RmiBPNUs7i8UQw2N89uAK3UzrGAWdnFfU=",
"owner": "ipetkov",
"repo": "crane",
"rev": "55e7754ec31dac78980c8be45f8a28e80e370946",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"crane_2": {
"locked": { "locked": {
"lastModified": 1725409566, "lastModified": 1725409566,
"narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=",
@ -219,7 +198,7 @@
"type": "github" "type": "github"
} }
}, },
"crane_3": { "crane_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"omnix", "omnix",
@ -392,22 +371,6 @@
} }
}, },
"flake-compat_4": { "flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_5": {
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
@ -421,7 +384,7 @@
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
} }
}, },
"flake-compat_6": { "flake-compat_5": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1688025799, "lastModified": 1688025799,
@ -437,7 +400,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_7": { "flake-compat_6": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1673956053,
@ -453,7 +416,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_8": { "flake-compat_7": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1673956053,
@ -490,27 +453,6 @@
} }
}, },
"flake-parts_2": { "flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"lanzaboote",
"nixpkgs"
]
},
"locked": {
"lastModified": 1717285511,
"narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_3": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
@ -528,7 +470,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_4": { "flake-parts_3": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"nixvim", "nixvim",
@ -550,7 +492,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_5": { "flake-parts_4": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
"nixvim", "nixvim",
@ -572,7 +514,7 @@
"type": "indirect" "type": "indirect"
} }
}, },
"flake-parts_6": { "flake-parts_5": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib_2" "nixpkgs-lib": "nixpkgs-lib_2"
}, },
@ -654,24 +596,6 @@
} }
}, },
"flake-utils_3": { "flake-utils_3": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
@ -686,7 +610,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_5": { "flake-utils_4": {
"inputs": { "inputs": {
"systems": [ "systems": [
"stylix", "stylix",
@ -725,8 +649,8 @@
}, },
"git-hooks": { "git-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_3",
"gitignore": "gitignore_2", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"neovim-nightly-overlay", "neovim-nightly-overlay",
@ -759,7 +683,7 @@
"nixvim", "nixvim",
"flake-compat" "flake-compat"
], ],
"gitignore": "gitignore_3", "gitignore": "gitignore_2",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"nixvim", "nixvim",
@ -788,8 +712,9 @@
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"lanzaboote", "nixvim",
"pre-commit-hooks-nix", "neovim-nightly-overlay",
"git-hooks",
"nixpkgs" "nixpkgs"
] ]
}, },
@ -811,7 +736,7 @@
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"neovim-nightly-overlay", "nixvim",
"git-hooks", "git-hooks",
"nixpkgs" "nixpkgs"
] ]
@ -831,29 +756,6 @@
} }
}, },
"gitignore_3": { "gitignore_3": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixvim",
"git-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"gitignore_4": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"pre-commit-hooks", "pre-commit-hooks",
@ -893,7 +795,7 @@
}, },
"hercules-ci-effects": { "hercules-ci-effects": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_5", "flake-parts": "flake-parts_4",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"neovim-nightly-overlay", "neovim-nightly-overlay",
@ -978,33 +880,6 @@
"type": "github" "type": "github"
} }
}, },
"lanzaboote": {
"inputs": {
"crane": "crane",
"flake-compat": "flake-compat_2",
"flake-parts": "flake-parts_2",
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs"
],
"pre-commit-hooks-nix": "pre-commit-hooks-nix",
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1718178907,
"narHash": "sha256-eSZyrQ9uoPB9iPQ8Y5H7gAmAgAvCw3InStmU3oEjqsE=",
"owner": "nix-community",
"repo": "lanzaboote",
"rev": "b627ccd97d0159214cee5c7db1412b75e4be6086",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "v0.4.1",
"repo": "lanzaboote",
"type": "github"
}
},
"libgit2": { "libgit2": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -1023,8 +898,8 @@
}, },
"neovim-nightly-overlay": { "neovim-nightly-overlay": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_2",
"flake-parts": "flake-parts_4", "flake-parts": "flake-parts_3",
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"hercules-ci-effects": "hercules-ci-effects", "hercules-ci-effects": "hercules-ci-effects",
"neovim-src": "neovim-src", "neovim-src": "neovim-src",
@ -1063,7 +938,7 @@
"nish": { "nish": {
"inputs": { "inputs": {
"advisory-db": "advisory-db", "advisory-db": "advisory-db",
"crane": "crane_2", "crane": "crane",
"fenix": "fenix", "fenix": "fenix",
"flake-parts": [ "flake-parts": [
"flake-parts" "flake-parts"
@ -1097,7 +972,7 @@
}, },
"nix": { "nix": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_7", "flake-compat": "flake-compat_6",
"flake-parts": [ "flake-parts": [
"omnix", "omnix",
"flake-parts" "flake-parts"
@ -1261,22 +1136,6 @@
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": {
"lastModified": 1710695816,
"narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "614b4613980a522ba49f0d194531beddbb7220d3",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1720386169, "lastModified": 1720386169,
"narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=",
@ -1342,7 +1201,7 @@
}, },
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_3", "flake-parts": "flake-parts_2",
"neovim-nightly-overlay": "neovim-nightly-overlay", "neovim-nightly-overlay": "neovim-nightly-overlay",
"nixpkgs": [ "nixpkgs": [
"unstable" "unstable"
@ -1366,7 +1225,7 @@
"nixvim_2": { "nixvim_2": {
"inputs": { "inputs": {
"devshell": "devshell", "devshell": "devshell",
"flake-compat": "flake-compat_5", "flake-compat": "flake-compat_4",
"flake-parts": [ "flake-parts": [
"nixvim", "nixvim",
"flake-parts" "flake-parts"
@ -1427,7 +1286,7 @@
}, },
"nuschtosSearch": { "nuschtosSearch": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"nixvim", "nixvim",
@ -1491,7 +1350,7 @@
"omnix", "omnix",
"nix" "nix"
], ],
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_3",
"gitignore": [ "gitignore": [
"omnix", "omnix",
"nix" "nix"
@ -1521,43 +1380,16 @@
"type": "github" "type": "github"
} }
}, },
"pre-commit-hooks-nix": {
"inputs": {
"flake-compat": [
"lanzaboote",
"flake-compat"
],
"gitignore": "gitignore",
"nixpkgs": [
"lanzaboote",
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1717664902,
"narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"type": "github"
}
},
"pre-commit-hooks_2": { "pre-commit-hooks_2": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
"flake-compat" "flake-compat"
], ],
"gitignore": "gitignore_4", "gitignore": "gitignore_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1725513492, "lastModified": 1725513492,
@ -1597,7 +1429,6 @@
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"lanzaboote": "lanzaboote",
"nish": "nish", "nish": "nish",
"nixinate": "nixinate", "nixinate": "nixinate",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
@ -1606,7 +1437,7 @@
"omnix": "omnix", "omnix": "omnix",
"pre-commit-hooks": "pre-commit-hooks_2", "pre-commit-hooks": "pre-commit-hooks_2",
"stylix": "stylix", "stylix": "stylix",
"systems": "systems_5", "systems": "systems_4",
"treefmt-nix": "treefmt-nix_3", "treefmt-nix": "treefmt-nix_3",
"unstable": "unstable" "unstable": "unstable"
} }
@ -1630,12 +1461,12 @@
}, },
"rust-flake": { "rust-flake": {
"inputs": { "inputs": {
"crane": "crane_3", "crane": "crane_2",
"nixpkgs": [ "nixpkgs": [
"omnix", "omnix",
"nixpkgs" "nixpkgs"
], ],
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1725522236, "lastModified": 1725522236,
@ -1653,31 +1484,6 @@
} }
}, },
"rust-overlay": { "rust-overlay": {
"inputs": {
"flake-utils": [
"lanzaboote",
"flake-utils"
],
"nixpkgs": [
"lanzaboote",
"nixpkgs"
]
},
"locked": {
"lastModified": 1717813066,
"narHash": "sha256-wqbRwq3i7g5EHIui0bIi84mdqZ/It1AXBSLJ5tafD28=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "6dc3e45fe4aee36efeed24d64fc68b1f989d5465",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725243956, "lastModified": 1725243956,
@ -1695,8 +1501,8 @@
}, },
"sbomnix": { "sbomnix": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_6", "flake-compat": "flake-compat_5",
"flake-parts": "flake-parts_6", "flake-parts": "flake-parts_5",
"flake-root": "flake-root", "flake-root": "flake-root",
"nix-visualize": "nix-visualize", "nix-visualize": "nix-visualize",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
@ -1726,8 +1532,8 @@
"base16-kitty": "base16-kitty", "base16-kitty": "base16-kitty",
"base16-tmux": "base16-tmux", "base16-tmux": "base16-tmux",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"flake-compat": "flake-compat_8", "flake-compat": "flake-compat_7",
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_4",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": [ "home-manager": [
"home-manager" "home-manager"
@ -1735,7 +1541,7 @@
"nixpkgs": [ "nixpkgs": [
"unstable" "unstable"
], ],
"systems": "systems_4" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1725290973, "lastModified": 1725290973,
@ -1811,21 +1617,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_5": {
"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": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [

14
flake.nix
View file

@ -8,10 +8,9 @@
... ...
} @ inputs: let } @ inputs: let
mods = import ./modules; mods = import ./modules;
cLib = import ./lib {inherit (nixpkgs) lib;};
mkLinuxSystem = mod: mkLinuxSystem = mod:
nixpkgs.lib.nixosSystem { nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs cLib;}; specialArgs = {inherit inputs;};
modules = modules =
[ [
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
@ -21,8 +20,8 @@
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [self.overlays.default]; nixpkgs.overlays = [self.overlays.default];
} }
mod
] ]
++ mod
++ mods.sharedModules; ++ mods.sharedModules;
}; };
in in
@ -39,8 +38,8 @@
inherit (mods) homeManagerModules nixosModules; inherit (mods) homeManagerModules nixosModules;
# TODO: use ./hosts/ # TODO: use ./hosts/
nixosConfigurations = { nixosConfigurations = {
artemis = mkLinuxSystem [./hosts/artemis inputs.lanzaboote.nixosModules.lanzaboote]; artemis = mkLinuxSystem ./hosts/artemis;
hermes = mkLinuxSystem [./hosts/hermes]; hermes = mkLinuxSystem ./hosts/hermes;
}; };
diskoConfigurations = {}; # maybe? diskoConfigurations = {}; # maybe?
om.health.default = {nix-version.min-required = "2.18.5";}; om.health.default = {nix-version.min-required = "2.18.5";};
@ -161,11 +160,6 @@
treefmt-nix.url = "github:numtide/treefmt-nix"; treefmt-nix.url = "github:numtide/treefmt-nix";
treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
lanzaboote = {
url = "github:nix-community/lanzaboote/v0.4.1";
inputs.nixpkgs.follows = "nixpkgs";
};
# my custom programs # my custom programs
nish = { nish = {
url = "github:callumio/nish"; url = "github:callumio/nish";

1
home/c/default.nix
View file

@ -19,7 +19,6 @@
}; };
home.packages = with pkgs; [ home.packages = with pkgs; [
# TODO: sort this out
gnome.adwaita-icon-theme gnome.adwaita-icon-theme
networkmanagerapplet networkmanagerapplet
libsecret libsecret

14
home/c/programs/fish/default.nix
View file

@ -1,13 +1,8 @@
{ {pkgs, ...}: let
pkgs,
cLib,
...
}: let
mkFishPlug = pkg: { mkFishPlug = pkg: {
name = pkg.pname; name = pkg.pname;
inherit (pkg) src; inherit (pkg) src;
}; };
tmux = cLib.getProgFor pkgs "tmux";
in { in {
programs.fish = { programs.fish = {
enable = true; enable = true;
@ -17,15 +12,14 @@ in {
trap __trap_exit_tmux EXIT trap __trap_exit_tmux EXIT
''; '';
# TODO: dont use this directly
shellAliases = {v = "nvim";}; shellAliases = {v = "nvim";};
functions = { functions = {
__trap_exit_tmux = { __trap_exit_tmux = {
body = '' body = ''
test (${tmux} list-windows | wc -l) = 1 || exit test (tmux list-windows | wc -l) = 1 || exit
test (${tmux} list-panes | wc -l) = 1 || exit test (tmux list-panes | wc -l) = 1 || exit
${tmux} switch-client -t main tmux switch-client -t main
''; '';
}; };
}; };

82
home/c/programs/hypr/default.nix
View file

@ -1,28 +1,4 @@
{ {...}: {
pkgs,
cLib,
...
}: let
getProgFor' = cLib.getProgFor' pkgs;
getProgFor = cLib.getProgFor pkgs;
web = getProgFor "firefox";
mail = getProgFor "betterbird";
chat = getProgFor "discord";
media = getProgFor "spotify";
terminal = getProgFor "alacritty";
runner = getProgFor "rofi";
rofi-rbw = getProgFor "rofi-rbw-wayland";
tmux = getProgFor "tmux";
slurp = getProgFor "slurp";
grim = getProgFor "grim";
wl-copy = getProgFor' "wl-clipboard" "wl-copy";
mullvad = getProgFor' "mullvad-vpn" "mullvad-gui";
playerctl = getProgFor "playerctl";
brightnessctl = getProgFor "brightnessctl";
wpctl = getProgFor' "wireplumber" "wpctl";
hyprlock = getProgFor "hyprlock";
hyprctl = getProgFor' "hyprland" "hyprctl";
in {
services = { services = {
blueman-applet.enable = true; blueman-applet.enable = true;
network-manager-applet.enable = true; network-manager-applet.enable = true;
@ -89,7 +65,7 @@ in {
enable = true; enable = true;
systemd.enable = true; systemd.enable = true;
xwayland.enable = true; xwayland.enable = true;
# TODO: move to nix config over text
settings = { settings = {
"monitor" = ",prefered,auto,1"; "monitor" = ",prefered,auto,1";
@ -161,13 +137,13 @@ in {
"$mainMod SHIFT, q, exit" "$mainMod SHIFT, q, exit"
"$mainMod, F, fullscreen" "$mainMod, F, fullscreen"
"$mainMod SHIFT, f, togglefloating" "$mainMod SHIFT, f, togglefloating"
"$mainMod, d, exec, ${runner} -show drun" "$mainMod, d, exec, rofi -show drun"
"$mainMod, w, exec, ${runner} -show window" "$mainMod, w, exec, rofi -show window"
"$mainMod, p, exec, ${rofi-rbw} --no-folder" "$mainMod, p, exec, rofi-rbw --no-folder"
"$mainMod, s, togglesplit" "$mainMod, s, togglesplit"
"$mainMod SHIFT, r, exec, ${hyprctl} reload" "$mainMod SHIFT, r, exec, hyprctl reload"
"$mainMod, return, exec, ${terminal} -e ${tmux} new -A -s main" "$mainMod, return, exec, alacritty -e tmux new -A -s main"
"$mainMod SHIFT, return, exec, [float; pin] ${terminal} -e ${tmux} new -A -s main" "$mainMod SHIFT, return, exec, [float; pin] alacritty -e tmux new -A -s main"
"$mainMod, b, workspace, name:web" "$mainMod, b, workspace, name:web"
"$mainMod, n, workspace, name:chat" "$mainMod, n, workspace, name:chat"
@ -196,9 +172,9 @@ in {
"$mainMod SHIFT, l, movewindow, r" "$mainMod SHIFT, l, movewindow, r"
"$mainMod SHIFT, k, movewindow, u" "$mainMod SHIFT, k, movewindow, u"
"$mainMod SHIFT, j, movewindow, d" "$mainMod SHIFT, j, movewindow, d"
''SHIFT, Print, exec, ${grim} -g "$(${slurp})" - | ${wl-copy}'' ''SHIFT, Print, exec, grim -g "$(slurp)" - | wl-copy''
", Print, exec, ${grim} - | ${wl-copy}" ", Print, exec, grim - | wl-copy"
"$mainMod, 0, exec, ${hyprlock}" "$mainMod, 0, exec, hyprlock"
] ]
++ (builtins.concatLists (builtins.genList (x: let ++ (builtins.concatLists (builtins.genList (x: let
ws = x + 1; ws = x + 1;
@ -211,10 +187,10 @@ in {
9)); 9));
workspace = [ workspace = [
"name:web, on-created-empty: ${web}" "name:web, on-created-empty: firefox"
"name:chat, on-created-empty: ${chat}" "name:chat, on-created-empty: discord"
"name:media, on-created-empty: ${media}" "name:media, on-created-empty: spotify"
"name:mail, on-created-empty: ${mail}" "name:mail, on-created-empty: betterbird"
]; ];
bindm = [ bindm = [
@ -223,19 +199,25 @@ in {
]; ];
bindle = [ bindle = [
", XF86AudioRaiseVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 5%+" ", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
", XF86AudioLowerVolume, 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" ", XF86AudioMute , exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
", XF86AudioMicMute , exec, ${wpctl} set-mute @DEFAULT_AUDIO_SOURCE@ toggle" ", XF86AudioMicMute , exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
", XF86AudioPlay , exec, ${playerctl} play-pause" ", XF86AudioPlay , exec, playerctl play-pause"
", XF86AudioPause , exec, ${playerctl} play-pause" ", XF86AudioPause , exec, playerctl play-pause"
", XF86AudioNext , exec, ${playerctl} next" ", XF86AudioNext , exec, playerctl next"
", XF86AudioPrev , exec, ${playerctl} previous" ", XF86AudioPrev , exec, playerctl previous"
", XF86MonBrightnessUp, exec, ${brightnessctl} -c backlight set +5%" ", XF86MonBrightnessUp, exec, brightnessctl -c backlight set +5%"
", XF86MonBrightnessDown, exec, ${brightnessctl} -c backlight set 5%-" ", XF86MonBrightnessDown, exec, brightnessctl -c backlight set 5%-"
]; ];
exec-once = [(toString mullvad)]; exec = [
#"pkill wpaperd & sleep 0.5 && wpaperd"
#"pkill waybar & sleep 0.5 && waybar"
#"pkill mako & sleep 0.5 && mako"
];
exec-once = ["mullvad-gui"];
}; };
}; };
} }

6
home/c/programs/nvim/.luarc.json Normal file
View file

@ -0,0 +1,6 @@
{
"diagnostics.globals": [
"vim",
"lsp_on_attach"
]
}

313
home/c/programs/nvim/default.nix Normal file
View file

@ -0,0 +1,313 @@
{
config,
pkgs,
lib,
...
}: {
programs.neovim = let
leaders = ''
vim.g.mapleader = ' '
vim.g.maplocalleader = ' '
'';
toLua = str: ''
lua << EOF
${leaders}
${str}
EOF
'';
toLuaFile = file: ''
lua << EOF
${leaders}
${builtins.readFile file}
EOF
'';
toLuaFileLSP = file: ''
lua << EOF
${leaders}
${builtins.readFile ./plugin/lsp/lsp-keys.lua}
${builtins.readFile file}
EOF
'';
fromGit = ref: rev: repo:
pkgs.vimUtils.buildVimPlugin {
pname = "${lib.strings.sanitizeDerivationName repo}";
version = ref;
src = builtins.fetchGit {
url = "https://github.com/${repo}.git";
inherit ref;
inherit rev;
};
};
# always installs latest version
pluginGit = fromGit "HEAD";
in {
enable = true;
# package = pkgs.neovim-nightly;
extraPackages = with pkgs; [
# Rust
rust-analyzer
cargo
rustc
rustfmt
# YAML
yaml-language-server
# JSON
nodePackages.vscode-json-languageserver
# Go
gopls
# Typescript
nodePackages.typescript
nodePackages.typescript-language-server
# Javascript
eslint_d
# Python
nodePackages.pyright
black
# Util
ripgrep
fzf
# C-Family
clang-tools
# Shell
shellcheck
shfmt
# Lua
lua-language-server
selene
stylua
# Nix
rnix-lsp
nixfmt
statix
# LLM
ollama
# Haskell
haskellPackages.haskell-debug-adapter
haskellPackages.haskell-language-server
haskellPackages.fourmolu
ghc
# Docker
dockerfile-language-server-nodejs
docker-compose-language-service
];
defaultEditor = true;
viAlias = true;
vimAlias = true;
vimdiffAlias = true;
extraLuaConfig = ''
${builtins.readFile ./options.lua}
'';
plugins = with pkgs.vimPlugins; [
{
plugin = nvim-lspconfig;
config = toLuaFileLSP ./plugin/lsp/lsp.lua;
}
{
plugin = crates-nvim;
config = toLua "require('crates').setup()";
}
{
plugin = rustaceanvim;
config = toLuaFileLSP ./plugin/lsp/rust.lua;
}
{
plugin = haskell-tools-nvim;
config = toLuaFileLSP ./plugin/lsp/haskell.lua;
}
{
plugin = SchemaStore-nvim;
config = toLuaFileLSP ./plugin/lsp/schemastore.lua;
}
{
plugin = todo-comments-nvim;
config =
toLua
"require('todo-comments').setup(); vim.api.nvim_set_keymap('n', '<leader>vtd', ':TodoTelescope<CR>', { noremap = true });";
}
{
plugin = comment-nvim;
config = toLua "require('Comment').setup()";
}
{
plugin = onedark-nvim;
config = "colorscheme onedark";
}
neodev-nvim
{
plugin = nvim-cmp;
config = toLuaFile ./plugin/cmp.lua;
}
{
plugin = telescope-nvim;
config = toLuaFile ./plugin/telescope.lua;
}
{
plugin =
pluginGit "951b163e55ce7639eb320c450bde9283c4fe968b"
"laytan/cloak.nvim";
config = toLuaFile ./plugin/cloak.lua;
}
{
plugin =
pluginGit "41ad952c8269fa7aa3a4b8a5abb44541cb628313"
"David-Kunz/gen.nvim";
config = toLuaFile ./plugin/gen.lua;
}
{
plugin = nvim-dap;
config = toLuaFile ./plugin/debugger.lua;
}
{
plugin =
pluginGit "fd35a46f4b7c1b244249266bdcb2da3814f01724"
"xiyaowong/transparent.nvim";
config = toLua "require('transparent').setup{}";
}
nvim-dap-ui
telescope-dap-nvim
nvim-dap-virtual-text
telescope-fzf-native-nvim
cmp_luasnip
cmp-nvim-lsp
luasnip
friendly-snippets
{
plugin = hardtime-nvim;
config = toLua "require('hardtime').setup()";
}
{
plugin = nvim-surround;
config = toLua "require('nvim-surround').setup{}";
}
{
plugin = harpoon;
config = toLuaFile ./plugin/harpoon.lua;
}
{
plugin = lualine-nvim;
config =
toLua
"require('lualine').setup{options = {icons_enabled = true, theme = 'onedark', component_separators = '|', section_separators = ''}, sections = { lualine_a = { { 'buffers', } } }}";
}
{
plugin = nvim-autopairs;
config = toLua "require('nvim-autopairs').setup {}";
}
{
plugin = leap-nvim;
config = toLua "require('leap.user').add_default_mappings()";
}
{
plugin = none-ls-nvim;
config = toLuaFile ./plugin/lsp/none-ls.lua;
}
{
plugin = oil-nvim;
config = toLuaFile ./plugin/oil.lua;
}
{
plugin = zen-mode-nvim;
config = toLuaFile ./plugin/zen.lua;
}
twilight-nvim
nvim-web-devicons
{
plugin = undotree;
config =
toLua "vim.keymap.set('n', '<leader>u', vim.cmd.UndotreeToggle)";
}
{
plugin = gitsigns-nvim;
config = toLuaFile ./plugin/gitsigns.lua;
}
{
plugin = nvim-treesitter.withPlugins (p: [
p.tree-sitter-nix
p.tree-sitter-vim
p.tree-sitter-bash
p.tree-sitter-lua
p.tree-sitter-python
p.tree-sitter-rust
p.tree-sitter-json
p.tree-sitter-c
p.tree-sitter-comment
p.tree-sitter-javascript
p.tree-sitter-fish
p.tree-sitter-dockerfile
p.tree-sitter-cpp
p.tree-sitter-git_config
p.tree-sitter-git_rebase
p.tree-sitter-gitattributes
p.tree-sitter-gitcommit
p.tree-sitter-gitignore
p.tree-sitter-markdown
p.tree-sitter-markdown_inline
p.tree-sitter-make
p.tree-sitter-norg
p.tree-sitter-ssh_config
p.tree-sitter-typescript
p.tree-sitter-tsx
p.tree-sitter-haskell
p.tree-sitter-yaml
p.tree-sitter-zig
]);
config = toLuaFile ./plugin/treesitter.lua;
}
vim-nix
];
};
}

23
home/c/programs/tmux/default.nix
View file

@ -1,13 +1,4 @@
{ {pkgs, ...}: {
pkgs,
cLib,
...
}: let
getProgFor = cLib.getProgFor pkgs;
getProgFor' = cLib.getProgFor' pkgs;
tmux = getProgFor "tmux";
tmux-sessionizer = getProgFor' "tmux-sessionizer-cl" "tmux-sessionizer";
in {
programs.tmux = { programs.tmux = {
enable = true; enable = true;
shortcut = "x"; shortcut = "x";
@ -51,9 +42,9 @@ in {
bind \\ split-window -v -c "#{pane_current_path}" bind \\ split-window -v -c "#{pane_current_path}"
bind c new-window -c "#{pane_current_path}" bind c new-window -c "#{pane_current_path}"
bind-key -r s run-shell "${tmux} display-popup -E '${tmux-sessionizer} -s'" bind-key -r s run-shell "tmux display-popup -E 'tmux-sessionizer -s'"
bind-key -r f run-shell "${tmux} display-popup -E '${tmux-sessionizer} -p'" bind-key -r f run-shell "tmux display-popup -E 'tmux-sessionizer -p'"
bind-key -r m run-shell "${tmux} switch-client -t main" bind-key -r m run-shell "tmux switch-client -t main"
bind S choose-tree bind S choose-tree
bind -r k select-pane -U bind -r k select-pane -U
@ -63,7 +54,7 @@ in {
''; '';
}; };
# home.packages = [ home.packages = [
# pkgs.tmux-sessionizer-cl pkgs.tmux-sessionizer-cl
# ]; ];
} }

10
home/c/programs/waybar/default.nix
View file

@ -1,10 +1,4 @@
{ {pkgs, ...}: {
pkgs,
cLib,
...
}: let
soundControl = cLib.getProgFor pkgs "pwvucontrol";
in {
programs.waybar = { programs.waybar = {
enable = true; enable = true;
package = pkgs.waybar.override { package = pkgs.waybar.override {
@ -41,7 +35,7 @@ in {
tooltip = false; tooltip = false;
}; };
wireplumber = { wireplumber = {
on-click = toString soundControl; on-click = "${pkgs.pwvucontrol}/bin/pwvucontrol";
format = "{icon} {volume}%"; format = "{icon} {volume}%";
format-muted = ""; format-muted = "";
format-icons = ["" "" ""]; format-icons = ["" "" ""];

1
hosts/artemis/configuration.nix
View file

@ -37,7 +37,6 @@
killall killall
gcc gcc
pkg-config pkg-config
sbctl
nish nish
nsbm nsbm
]; ];

6
hosts/artemis/hardware-configuration.nix
View file

@ -13,12 +13,6 @@
kernelModules = ["kvm-intel"]; kernelModules = ["kvm-intel"];
extraModulePackages = []; extraModulePackages = [];
#kernelPackages = pkgs.linuxPackages_latest; #kernelPackages = pkgs.linuxPackages_latest;
loader.systemd-boot.enable = lib.mkForce false;
lanzaboote = {
enable = true;
pkiBundle = "/etc/secureboot";
};
}; };
hardware = { hardware = {
bluetooth = { bluetooth = {

8
hosts/artemis/home.nix
View file

@ -1,8 +1,4 @@
{ {inputs, ...}: {
inputs,
cLib,
...
}: {
programs.hyprlock.enable = true; programs.hyprlock.enable = true;
security.pam.services.hyprlock = {}; security.pam.services.hyprlock = {};
home-manager = { home-manager = {
@ -15,6 +11,6 @@
inputs.self.homeManagerModules.trayscale inputs.self.homeManagerModules.trayscale
]; ];
users.c = import ../../home/c; users.c = import ../../home/c;
extraSpecialArgs = {inherit inputs cLib;}; extraSpecialArgs = {inherit inputs;};
}; };
} }

6
lib/default.nix
View file

@ -1,6 +0,0 @@
{lib, ...}: let
getProgFor' = pkgs: prog: progn: lib.getExe' pkgs.${prog} progn;
getProgFor = pkgs: prog: getProgFor' pkgs prog prog;
in {
inherit getProgFor getProgFor';
}