Nickiel/nicks-nix-config
1
0
Fork 0
mirror of https://github.com/Nickiel12/nicks-nix-config.git synced 2024-11-28 07:25:29 -08:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: Nickiel:8b3c0c24456ee41959d74d7e5d7b6ad4f59bb3eb
Branches Tags
Nickiel:main
Nickiel:awesome-dev
..
compare: Nickiel:3a56737194db7a3d95b0bb2f36f6f8721aba0cfd
Branches Tags
Nickiel:main
Nickiel:awesome-dev

No commits in common. "8b3c0c24456ee41959d74d7e5d7b6ad4f59bb3eb" and "3a56737194db7a3d95b0bb2f36f6f8721aba0cfd" have entirely different histories.
8b3c0c2445 ... 3a56737194

4 changed files with 52 additions and 219 deletions
Show stats Expand all files Collapse all files

175
flake.lock
View file

@ -10,11 +10,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719991445, "lastModified": 1719347071,
"narHash": "sha256-0zSXPres0wlhS9n6h44ZzV0TOeWdMsICMlHAGjqkWGE=", "narHash": "sha256-RWhQWZ6RVZaJlkzpPkoKPKcOgfc4nB/DJ7NYWa3SFW0=",
"owner": "atuinsh", "owner": "atuinsh",
"repo": "atuin", "repo": "atuin",
"rev": "a67cfc82fe0dc907a01f07a0fd625701e062a33b", "rev": "fd3aca7cb3394d895d27e8cea26a02948b06d6f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -25,7 +25,7 @@
}, },
"devshell": { "devshell": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_4",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
@ -73,11 +73,11 @@
"rust-analyzer-src": "rust-analyzer-src" "rust-analyzer-src": "rust-analyzer-src"
}, },
"locked": { "locked": {
"lastModified": 1719728857, "lastModified": 1717827974,
"narHash": "sha256-TW68WegsA2KLjQMHTaP2//tLgXSaFiRdZKxKUc7vEtY=", "narHash": "sha256-ixopuTeTouxqTxfMuzs6IaRttbT8JqRW5C9Q/57WxQw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "fenix", "repo": "fenix",
"rev": "2c06f54eb102f325f88472a9713f6d779726c2f7", "rev": "ab655c627777ab5f9964652fe23bbb1dfbd687a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -103,22 +103,6 @@
} }
}, },
"flake-compat_2": { "flake-compat_2": {
"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_3": {
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
@ -132,7 +116,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_4": { "flake-compat_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -156,11 +140,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719877454, "lastModified": 1717285511,
"narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=", "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "4e3583423212f9303aa1a6337f8dffb415920e4f", "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -227,24 +211,6 @@
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_4"
}, },
"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_5": {
"inputs": {
"systems": "systems_5"
},
"locked": { "locked": {
"lastModified": 1701680307, "lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
@ -261,7 +227,7 @@
}, },
"git-hooks": { "git-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_3",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
@ -339,11 +305,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720135141, "lastModified": 1719180626,
"narHash": "sha256-1GHh1/WO+f42TXxb1WiZFMuepM7ITA9iT+6yJBbBNsY=", "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c514e862cd5705e51edb6fe8d01146fdeec661f2", "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -360,11 +326,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719827439, "lastModified": 1719180626,
"narHash": "sha256-tneHOIv1lEavZ0vQ+rgz67LPNCgOZVByYki3OkSshFU=", "narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "59ce796b2563e19821361abbe2067c3bb4143a7d", "rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -420,11 +386,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719845423, "lastModified": 1719128254,
"narHash": "sha256-ZLHDmWAsHQQKnmfyhYSHJDlt8Wfjv6SQhl2qek42O7A=", "narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "ec12b88104d6c117871fad55e931addac4626756", "rev": "50581970f37f06a4719001735828519925ef8310",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -433,27 +399,6 @@
"type": "github" "type": "github"
} }
}, },
"nixos-wsl": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1719220171,
"narHash": "sha256-xywM6JoGT8AwfoOFJBTv8GRlvNu8LYqqqMS/OQ6uCgE=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "269411cfed6aab694e46f719277c972de96177bb",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "main",
"repo": "NixOS-WSL",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1699099776, "lastModified": 1699099776,
@ -472,11 +417,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1719957072, "lastModified": 1719360816,
"narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=", "narHash": "sha256-M+Y8bpqGFpQ6lqyEanI6n3PQyof0C10PtwFFnVKX5u8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7144d6241f02d171d25fba3edeaf15e0f2592105", "rev": "8f1ca02fb2097f3e724f8cf6057ddbbdefa7c6cc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -552,27 +497,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1718835956, "lastModified": 1719254875,
"narHash": "sha256-wM9v2yIxClRYsGHut5vHICZTK7xdrUGfrLkXvSuv6s4=", "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "dd457de7e08c6d06789b1f5b88fc9327f4d96309",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1720031269,
"narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9f4128e00b0ae8ec65918efeba59db998750ead6", "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -582,13 +511,13 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_8": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1719848872, "lastModified": 1719254875,
"narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -601,20 +530,20 @@
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"devshell": "devshell", "devshell": "devshell",
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_2",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixpkgs": "nixpkgs_8", "nixpkgs": "nixpkgs_7",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1720126856, "lastModified": 1719349326,
"narHash": "sha256-xtRwIUKv7EpuyGtvq+rO7PoZZIpD55AYe6rl+plEhY8=", "narHash": "sha256-siY3ck/6Ey2VyUpzziZ7XreM9h672CHEwTNuSqqnarA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "92e9f5466dcfd51e8e2e7627e992c1c9d5fc6fd6", "rev": "1a46075dfe8dbbd2c99980b59af7860a1de010db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -631,8 +560,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"kmonad": "kmonad", "kmonad": "kmonad",
"nicks_nextcloud_integrations": "nicks_nextcloud_integrations", "nicks_nextcloud_integrations": "nicks_nextcloud_integrations",
"nixos-wsl": "nixos-wsl", "nixpkgs": "nixpkgs_6",
"nixpkgs": "nixpkgs_7",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"nixvim": "nixvim", "nixvim": "nixvim",
"utils": "utils" "utils": "utils"
@ -641,11 +569,11 @@
"rust-analyzer-src": { "rust-analyzer-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1719576535, "lastModified": 1717583671,
"narHash": "sha256-YzF4P6YVInAjcR5eJHWefkKEu5t70KYVZMvdLODv8CM=", "narHash": "sha256-+lRAmz92CNUxorqWusgJbL9VE1eKCnQQojglRemzwkw=",
"owner": "rust-lang", "owner": "rust-lang",
"repo": "rust-analyzer", "repo": "rust-analyzer",
"rev": "9463d9eea4b87e651e7d8ed8425a9c92f23b1cdf", "rev": "48bbdd6a74f3176987d5c809894ac33957000d19",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -768,21 +696,6 @@
"type": "github" "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"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -791,11 +704,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719887753, "lastModified": 1719243788,
"narHash": "sha256-p0B2r98UtZzRDM5miGRafL4h7TwGRC4DII+XXHDHqek=", "narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "bdb6355009562d8f9313d9460c0d3860f525bc6c", "rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -806,7 +719,7 @@
}, },
"utils": { "utils": {
"inputs": { "inputs": {
"systems": "systems_6" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1710146030, "lastModified": 1710146030,

43
flake.nix
View file

@ -9,8 +9,6 @@
# url = "github:NixOS/nixpkgs/b477b25191fc94ce764428520b83b6b64366e3c8"; # url = "github:NixOS/nixpkgs/b477b25191fc94ce764428520b83b6b64366e3c8";
}; };
nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
nixpkgs-stable = { nixpkgs-stable = {
url = "github:NixOS/nixpkgs/release-23.11"; url = "github:NixOS/nixpkgs/release-23.11";
}; };
@ -45,7 +43,6 @@
ewwtilities, ewwtilities,
kmonad, kmonad,
atuin, atuin,
nixos-wsl,
... ...
}: }:
let let
@ -93,46 +90,6 @@
]; ];
}; };
# To change username after installing: https://nix-community.github.io/NixOS-WSL/how-to/change-username.html
NicksNixWSL = lib.nixosSystem {
inherit system;
modules = [
nixos-wsl.nixosModules.default
./hosts/WSL
{
networking.hostName = "NicksNixWSL";
system.stateVersion = "24.05";
# https://nix-community.github.io/NixOS-WSL/options.html
wsl = {
enable = true;
defaultUser = "nixolas";
# startMenuLaunchers = true;
useWindowsDriver = true;
};
}
#./hosts/WSL
home-manager.nixosModules.home-manager {
home-manager = {
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = {
inherit user ewwtilities atuin pkgs-stable;
};
users.${user} = {
imports = [
(import ./home.nix)
# Add nixvim to the homemanager
inputs.nixvim.homeManagerModules.nixvim
];
};
};
}
];
};
NicksNixLaptop = lib.nixosSystem { NicksNixLaptop = lib.nixosSystem {
inherit system; inherit system;
specialArgs = { specialArgs = {

19
home.nix
View file

@ -13,7 +13,6 @@ let
commandline_only_hosts = [ commandline_only_hosts = [
"Alaska" "Alaska"
"NicksNixWSL"
]; ];
install_packages = with pkgs; [ install_packages = with pkgs; [
@ -86,28 +85,26 @@ let
# Drawing tablet driver # Drawing tablet driver
opentabletdriver opentabletdriver
]; ];
filterNulls = list: builtins.filter (x: x != null) list;
in in
{ {
imports = filterNulls [ imports = [
./modules/atuin.nix ./modules/atuin.nix
./modules/discord.nix
#./modules/emacs.nix
./modules/fusuma.nix
./modules/git.nix ./modules/git.nix
./modules/hyprland
./modules/kitty.nix
./modules/neovim.nix ./modules/neovim.nix
./modules/rofi.nix
./modules/tmux.nix ./modules/tmux.nix
./modules/wezterm.nix ./modules/wezterm.nix
./modules/xdg.nix ./modules/xdg.nix
./modules/yazi.nix ./modules/yazi.nix
./modules/zsh.nix ./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)
#./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)
]; ];
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.
programs.home-manager.enable = true; programs.home-manager.enable = true;

34
hosts/WSL/default.nix
View file

@ -1,34 +0,0 @@
{ config, pkgs, ... }:
{
# See https://nix-community.github.io/NixOS-WSL/how-to/change-username.html
# to reset default WSL login
environment = {
shells = [
"/etc/profiles/per-user/nixolas/bin/zsh"
];
};
fonts.packages = with pkgs; [
(nerdfonts.override { fonts = ["DejaVuSansMono"]; })
dejavu_fonts
xkcd-font
];
nixpkgs.config.allowUnfree = true;
nix = {
gc = {
automatic = true;
options = "--delete-generations 20d";
};
settings = {
auto-optimise-store = true;
# max cores used per derivation
cores = 8;
# max derivations that can be built at once
# nix.settings.max-jobs = 2;
};
package = pkgs.nixVersions.stable;
extraOptions = "experimental-features = nix-command flakes";
};
}