diff --git a/flake.lock b/flake.lock index f967239..da43051 100644 --- a/flake.lock +++ b/flake.lock @@ -184,27 +184,6 @@ } }, "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": { "lastModified": 1725409566, "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", @@ -219,7 +198,7 @@ "type": "github" } }, - "crane_3": { + "crane_2": { "inputs": { "nixpkgs": [ "omnix", @@ -392,22 +371,6 @@ } }, "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": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -421,7 +384,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_6": { + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1688025799, @@ -437,7 +400,7 @@ "type": "github" } }, - "flake-compat_7": { + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1673956053, @@ -453,7 +416,7 @@ "type": "github" } }, - "flake-compat_8": { + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1673956053, @@ -490,27 +453,6 @@ } }, "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": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -528,7 +470,7 @@ "type": "github" } }, - "flake-parts_4": { + "flake-parts_3": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -550,7 +492,7 @@ "type": "github" } }, - "flake-parts_5": { + "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "nixvim", @@ -572,7 +514,7 @@ "type": "indirect" } }, - "flake-parts_6": { + "flake-parts_5": { "inputs": { "nixpkgs-lib": "nixpkgs-lib_2" }, @@ -654,24 +596,6 @@ } }, "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": { "lastModified": 1667395993, "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", @@ -686,7 +610,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_4": { "inputs": { "systems": [ "stylix", @@ -725,8 +649,8 @@ }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_4", - "gitignore": "gitignore_2", + "flake-compat": "flake-compat_3", + "gitignore": "gitignore", "nixpkgs": [ "nixvim", "neovim-nightly-overlay", @@ -759,7 +683,7 @@ "nixvim", "flake-compat" ], - "gitignore": "gitignore_3", + "gitignore": "gitignore_2", "nixpkgs": [ "nixvim", "nixvim", @@ -788,8 +712,9 @@ "gitignore": { "inputs": { "nixpkgs": [ - "lanzaboote", - "pre-commit-hooks-nix", + "nixvim", + "neovim-nightly-overlay", + "git-hooks", "nixpkgs" ] }, @@ -811,7 +736,7 @@ "inputs": { "nixpkgs": [ "nixvim", - "neovim-nightly-overlay", + "nixvim", "git-hooks", "nixpkgs" ] @@ -831,29 +756,6 @@ } }, "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": { "nixpkgs": [ "pre-commit-hooks", @@ -893,7 +795,7 @@ }, "hercules-ci-effects": { "inputs": { - "flake-parts": "flake-parts_5", + "flake-parts": "flake-parts_4", "nixpkgs": [ "nixvim", "neovim-nightly-overlay", @@ -978,33 +880,6 @@ "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": { "flake": false, "locked": { @@ -1023,8 +898,8 @@ }, "neovim-nightly-overlay": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_4", + "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts_3", "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", @@ -1063,7 +938,7 @@ "nish": { "inputs": { "advisory-db": "advisory-db", - "crane": "crane_2", + "crane": "crane", "fenix": "fenix", "flake-parts": [ "flake-parts" @@ -1097,7 +972,7 @@ }, "nix": { "inputs": { - "flake-compat": "flake-compat_7", + "flake-compat": "flake-compat_6", "flake-parts": [ "omnix", "flake-parts" @@ -1261,22 +1136,6 @@ } }, "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": { "lastModified": 1720386169, "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", @@ -1342,7 +1201,7 @@ }, "nixvim": { "inputs": { - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts_2", "neovim-nightly-overlay": "neovim-nightly-overlay", "nixpkgs": [ "unstable" @@ -1366,7 +1225,7 @@ "nixvim_2": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "flake-parts": [ "nixvim", "flake-parts" @@ -1427,7 +1286,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixvim", "nixvim", @@ -1491,7 +1350,7 @@ "omnix", "nix" ], - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_3", "gitignore": [ "omnix", "nix" @@ -1521,43 +1380,16 @@ "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": { "inputs": { "flake-compat": [ "flake-compat" ], - "gitignore": "gitignore_4", + "gitignore": "gitignore_3", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { "lastModified": 1725513492, @@ -1597,7 +1429,6 @@ "flake-compat": "flake-compat", "flake-parts": "flake-parts", "home-manager": "home-manager_2", - "lanzaboote": "lanzaboote", "nish": "nish", "nixinate": "nixinate", "nixpkgs": "nixpkgs", @@ -1606,7 +1437,7 @@ "omnix": "omnix", "pre-commit-hooks": "pre-commit-hooks_2", "stylix": "stylix", - "systems": "systems_5", + "systems": "systems_4", "treefmt-nix": "treefmt-nix_3", "unstable": "unstable" } @@ -1630,12 +1461,12 @@ }, "rust-flake": { "inputs": { - "crane": "crane_3", + "crane": "crane_2", "nixpkgs": [ "omnix", "nixpkgs" ], - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay" }, "locked": { "lastModified": 1725522236, @@ -1653,31 +1484,6 @@ } }, "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, "locked": { "lastModified": 1725243956, @@ -1695,8 +1501,8 @@ }, "sbomnix": { "inputs": { - "flake-compat": "flake-compat_6", - "flake-parts": "flake-parts_6", + "flake-compat": "flake-compat_5", + "flake-parts": "flake-parts_5", "flake-root": "flake-root", "nix-visualize": "nix-visualize", "nixpkgs": "nixpkgs_3", @@ -1726,8 +1532,8 @@ "base16-kitty": "base16-kitty", "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_8", - "flake-utils": "flake-utils_5", + "flake-compat": "flake-compat_7", + "flake-utils": "flake-utils_4", "gnome-shell": "gnome-shell", "home-manager": [ "home-manager" @@ -1735,7 +1541,7 @@ "nixpkgs": [ "unstable" ], - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1725290973, @@ -1811,21 +1617,6 @@ "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": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index a5c05d9..1064831 100644 --- a/flake.nix +++ b/flake.nix @@ -8,10 +8,9 @@ ... } @ inputs: let mods = import ./modules; - cLib = import ./lib {inherit (nixpkgs) lib;}; mkLinuxSystem = mod: nixpkgs.lib.nixosSystem { - specialArgs = {inherit inputs cLib;}; + specialArgs = {inherit inputs;}; modules = [ inputs.home-manager.nixosModules.home-manager @@ -21,8 +20,8 @@ nixpkgs.config.allowUnfree = true; nixpkgs.overlays = [self.overlays.default]; } + mod ] - ++ mod ++ mods.sharedModules; }; in @@ -39,8 +38,8 @@ inherit (mods) homeManagerModules nixosModules; # TODO: use ./hosts/ nixosConfigurations = { - artemis = mkLinuxSystem [./hosts/artemis inputs.lanzaboote.nixosModules.lanzaboote]; - hermes = mkLinuxSystem [./hosts/hermes]; + artemis = mkLinuxSystem ./hosts/artemis; + hermes = mkLinuxSystem ./hosts/hermes; }; diskoConfigurations = {}; # maybe? om.health.default = {nix-version.min-required = "2.18.5";}; @@ -161,11 +160,6 @@ treefmt-nix.url = "github:numtide/treefmt-nix"; treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; - lanzaboote = { - url = "github:nix-community/lanzaboote/v0.4.1"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - # my custom programs nish = { url = "github:callumio/nish"; diff --git a/home/c/default.nix b/home/c/default.nix index 3f8bd92..d7e7aa2 100644 --- a/home/c/default.nix +++ b/home/c/default.nix @@ -19,7 +19,6 @@ }; home.packages = with pkgs; [ - # TODO: sort this out gnome.adwaita-icon-theme networkmanagerapplet libsecret diff --git a/home/c/programs/fish/default.nix b/home/c/programs/fish/default.nix index 4268b18..4b3c330 100644 --- a/home/c/programs/fish/default.nix +++ b/home/c/programs/fish/default.nix @@ -1,13 +1,8 @@ -{ - pkgs, - cLib, - ... -}: let +{pkgs, ...}: let mkFishPlug = pkg: { name = pkg.pname; inherit (pkg) src; }; - tmux = cLib.getProgFor pkgs "tmux"; in { programs.fish = { enable = true; @@ -17,15 +12,14 @@ in { trap __trap_exit_tmux EXIT ''; - # TODO: dont use this directly shellAliases = {v = "nvim";}; functions = { __trap_exit_tmux = { body = '' - test (${tmux} list-windows | wc -l) = 1 || exit - test (${tmux} list-panes | wc -l) = 1 || exit - ${tmux} switch-client -t main + test (tmux list-windows | wc -l) = 1 || exit + test (tmux list-panes | wc -l) = 1 || exit + tmux switch-client -t main ''; }; }; diff --git a/home/c/programs/hypr/default.nix b/home/c/programs/hypr/default.nix index a3e9483..bcdacdb 100644 --- a/home/c/programs/hypr/default.nix +++ b/home/c/programs/hypr/default.nix @@ -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 = { blueman-applet.enable = true; network-manager-applet.enable = true; @@ -89,7 +65,7 @@ in { enable = true; systemd.enable = true; xwayland.enable = true; - + # TODO: move to nix config over text settings = { "monitor" = ",prefered,auto,1"; @@ -161,13 +137,13 @@ in { "$mainMod SHIFT, q, exit" "$mainMod, F, fullscreen" "$mainMod SHIFT, f, togglefloating" - "$mainMod, d, exec, ${runner} -show drun" - "$mainMod, w, exec, ${runner} -show window" - "$mainMod, p, exec, ${rofi-rbw} --no-folder" + "$mainMod, d, exec, rofi -show drun" + "$mainMod, w, exec, rofi -show window" + "$mainMod, p, exec, rofi-rbw --no-folder" "$mainMod, s, togglesplit" - "$mainMod SHIFT, r, exec, ${hyprctl} reload" - "$mainMod, return, exec, ${terminal} -e ${tmux} new -A -s main" - "$mainMod SHIFT, return, exec, [float; pin] ${terminal} -e ${tmux} new -A -s main" + "$mainMod SHIFT, r, exec, hyprctl reload" + "$mainMod, return, exec, alacritty -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, n, workspace, name:chat" @@ -196,9 +172,9 @@ in { "$mainMod SHIFT, l, movewindow, r" "$mainMod SHIFT, k, movewindow, u" "$mainMod SHIFT, j, movewindow, d" - ''SHIFT, Print, exec, ${grim} -g "$(${slurp})" - | ${wl-copy}'' - ", Print, exec, ${grim} - | ${wl-copy}" - "$mainMod, 0, exec, ${hyprlock}" + ''SHIFT, Print, exec, grim -g "$(slurp)" - | wl-copy'' + ", Print, exec, grim - | wl-copy" + "$mainMod, 0, exec, hyprlock" ] ++ (builtins.concatLists (builtins.genList (x: let ws = x + 1; @@ -211,10 +187,10 @@ in { 9)); workspace = [ - "name:web, on-created-empty: ${web}" - "name:chat, on-created-empty: ${chat}" - "name:media, on-created-empty: ${media}" - "name:mail, on-created-empty: ${mail}" + "name:web, on-created-empty: firefox" + "name:chat, on-created-empty: discord" + "name:media, on-created-empty: spotify" + "name:mail, on-created-empty: betterbird" ]; bindm = [ @@ -223,19 +199,25 @@ in { ]; bindle = [ - ", 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" - ", XF86AudioMicMute , exec, ${wpctl} set-mute @DEFAULT_AUDIO_SOURCE@ toggle" - ", XF86AudioPlay , exec, ${playerctl} play-pause" - ", XF86AudioPause , exec, ${playerctl} play-pause" - ", XF86AudioNext , exec, ${playerctl} next" - ", XF86AudioPrev , exec, ${playerctl} previous" - ", XF86MonBrightnessUp, exec, ${brightnessctl} -c backlight set +5%" - ", XF86MonBrightnessDown, exec, ${brightnessctl} -c backlight set 5%-" + ", 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" + ", XF86AudioMicMute , exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle" + ", XF86AudioPlay , exec, playerctl play-pause" + ", XF86AudioPause , exec, playerctl play-pause" + ", XF86AudioNext , exec, playerctl next" + ", XF86AudioPrev , exec, playerctl previous" + ", XF86MonBrightnessUp, 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"]; }; }; } diff --git a/home/c/programs/nvim/.luarc.json b/home/c/programs/nvim/.luarc.json new file mode 100644 index 0000000..904146d --- /dev/null +++ b/home/c/programs/nvim/.luarc.json @@ -0,0 +1,6 @@ +{ + "diagnostics.globals": [ + "vim", + "lsp_on_attach" + ] +} diff --git a/home/c/programs/nvim/default.nix b/home/c/programs/nvim/default.nix new file mode 100644 index 0000000..000a085 --- /dev/null +++ b/home/c/programs/nvim/default.nix @@ -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', 'vtd', ':TodoTelescope', { 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', '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 + ]; + }; +} diff --git a/home/c/programs/tmux/default.nix b/home/c/programs/tmux/default.nix index 0f4cfeb..ffabf71 100644 --- a/home/c/programs/tmux/default.nix +++ b/home/c/programs/tmux/default.nix @@ -1,13 +1,4 @@ -{ - pkgs, - cLib, - ... -}: let - getProgFor = cLib.getProgFor pkgs; - getProgFor' = cLib.getProgFor' pkgs; - tmux = getProgFor "tmux"; - tmux-sessionizer = getProgFor' "tmux-sessionizer-cl" "tmux-sessionizer"; -in { +{pkgs, ...}: { programs.tmux = { enable = true; shortcut = "x"; @@ -51,9 +42,9 @@ in { bind \\ split-window -v -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 f run-shell "${tmux} display-popup -E '${tmux-sessionizer} -p'" - bind-key -r m run-shell "${tmux} switch-client -t main" + 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 m run-shell "tmux switch-client -t main" bind S choose-tree bind -r k select-pane -U @@ -63,7 +54,7 @@ in { ''; }; - # home.packages = [ - # pkgs.tmux-sessionizer-cl - # ]; + home.packages = [ + pkgs.tmux-sessionizer-cl + ]; } diff --git a/home/c/programs/waybar/default.nix b/home/c/programs/waybar/default.nix index 1d941fc..e5c5bfe 100644 --- a/home/c/programs/waybar/default.nix +++ b/home/c/programs/waybar/default.nix @@ -1,10 +1,4 @@ -{ - pkgs, - cLib, - ... -}: let - soundControl = cLib.getProgFor pkgs "pwvucontrol"; -in { +{pkgs, ...}: { programs.waybar = { enable = true; package = pkgs.waybar.override { @@ -41,7 +35,7 @@ in { tooltip = false; }; wireplumber = { - on-click = toString soundControl; + on-click = "${pkgs.pwvucontrol}/bin/pwvucontrol"; format = "{icon} {volume}%"; format-muted = ""; format-icons = ["" "" ""]; diff --git a/hosts/artemis/configuration.nix b/hosts/artemis/configuration.nix index e2e7c38..13ce697 100644 --- a/hosts/artemis/configuration.nix +++ b/hosts/artemis/configuration.nix @@ -37,7 +37,6 @@ killall gcc pkg-config - sbctl nish nsbm ]; diff --git a/hosts/artemis/hardware-configuration.nix b/hosts/artemis/hardware-configuration.nix index 3263411..ea07f90 100644 --- a/hosts/artemis/hardware-configuration.nix +++ b/hosts/artemis/hardware-configuration.nix @@ -13,12 +13,6 @@ kernelModules = ["kvm-intel"]; extraModulePackages = []; #kernelPackages = pkgs.linuxPackages_latest; - - loader.systemd-boot.enable = lib.mkForce false; - lanzaboote = { - enable = true; - pkiBundle = "/etc/secureboot"; - }; }; hardware = { bluetooth = { diff --git a/hosts/artemis/home.nix b/hosts/artemis/home.nix index 3bfde5c..fb18af5 100644 --- a/hosts/artemis/home.nix +++ b/hosts/artemis/home.nix @@ -1,8 +1,4 @@ -{ - inputs, - cLib, - ... -}: { +{inputs, ...}: { programs.hyprlock.enable = true; security.pam.services.hyprlock = {}; home-manager = { @@ -15,6 +11,6 @@ inputs.self.homeManagerModules.trayscale ]; users.c = import ../../home/c; - extraSpecialArgs = {inherit inputs cLib;}; + extraSpecialArgs = {inherit inputs;}; }; } diff --git a/lib/default.nix b/lib/default.nix deleted file mode 100644 index c8b84db..0000000 --- a/lib/default.nix +++ /dev/null @@ -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'; -}