gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

various fixes

Browse source
This commit is contained in:
Gerg-L 2023-07-18 17:18:24 -04:00
parent c13f56c217
commit 1cfe329423
6 changed files with 50 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

61
flake.lock generated
View file

@ -90,11 +90,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1689477032, "lastModified": 1689714265,
"narHash": "sha256-tcVslINoIDszgc5cES0Y1k0Lq1HHPla9PSALU+Y8jkY=", "narHash": "sha256-W0KAM+fCwof0a4Hwq90t6y/Rq2VXXigkd8He/0VuIQM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "66c990850b878437510cc6096e6babce86de5dcb", "rev": "09bdd6271391d562ca0d20d44e5f6e08e950b5eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -106,11 +106,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1689353238, "lastModified": 1689691350,
"narHash": "sha256-48FzJRK2+MD4GVXWMFNWih+8zJE+m7zBlyNOSJM1Dok=", "narHash": "sha256-rofLdQzpR98qB6HOdhUcz+uYZqiKu2NMBVMkH/gTrdo=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "33e1a8cd7042816a064c0d2bf32b6570d7e88b79", "rev": "be74807eef13ff8c90d55cf8b22b01d6d33b1641",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -143,11 +143,11 @@
}, },
"nixlib": { "nixlib": {
"locked": { "locked": {
"lastModified": 1688259758, "lastModified": 1689469483,
"narHash": "sha256-CYVbYQfIm3vwciCf6CCYE+WOOLE3vcfxfEfNHIfKUJQ=", "narHash": "sha256-2SBhY7rZQ/iNCxe04Eqxlz9YK9KgbaTMBssq3/BgdWY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "a92befce80a487380ea5e92ae515fe33cebd3ac6", "rev": "02fea408f27186f139153e1ae88f8ab2abd9c22c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -164,11 +164,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1688738567, "lastModified": 1689558522,
"narHash": "sha256-yax5BYOfpE0+95kyJmEcfKEdZBaFvCENDogBB4VQB3Q=", "narHash": "sha256-diNpqSRebzvT3P4fLX+40VWZbf2H2hraJDDdg5NJSj0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixos-generators", "repo": "nixos-generators",
"rev": "9191c85aab6b1a7ad395c13d340f2aa0e3ddf552", "rev": "11c98929963a95ad3830960a9216d00e2f792502",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -211,11 +211,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1689398528, "lastModified": 1689473667,
"narHash": "sha256-qVn/doWn20axR+KvmAAGexv0A5RVzcBbd5HfNMAMeVI=", "narHash": "sha256-41ePf1ylHMTogSPAiufqvBbBos+gtB6zjQlYFSEKFMM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3dc2bc15956db2ff2316af45eefd45803fc1372b", "rev": "13231eccfa1da771afa5c0807fdd73e05a1ec4e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -234,11 +234,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1689386166, "lastModified": 1689714720,
"narHash": "sha256-Vue9Wk6M5SU125WJrunklOen4fPcN9oBV/y9bbmlOA8=", "narHash": "sha256-I+dQltXVuxQOTESF7Mq90Khu5kWPUv48CIbjTHGl0Ss=",
"owner": "gerg-L", "owner": "gerg-L",
"repo": "nvim-flake", "repo": "nvim-flake",
"rev": "3ec1c636652aa3809b4199a546bbc44761bc7875", "rev": "6788a669fa8e55159637c616305b15de1a8b91c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -287,11 +287,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1689405598, "lastModified": 1689534977,
"narHash": "sha256-80fuO3FiXgJmUDQgB7sc2lq8Qe/oSkqDNwx9N/fCtBs=", "narHash": "sha256-EB4hasmjKgetTR0My2bS5AwELZFIQ4zANLqHKi7aVXg=",
"owner": "mic92", "owner": "mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "cfe47aff8660fd760b1db89613a3205c2c4ba7b6", "rev": "bd695cc4d0a5e1bead703cc1bec5fa3094820a81",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -307,27 +307,26 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1689297469, "lastModified": 1689544884,
"narHash": "sha256-ZNwNpESPRD/STBJa0c3VCQ+gFtimSPeKCN/A0Xmb8ls=", "narHash": "sha256-6baLlCq5VkRij/6dB6UaAaUWw/E4sTzKSwryRWARWTU=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "d57dd446a91490ae2983c968f4767bd50047ab5b", "rev": "a48f9a4cdae18516a54fe771051447300d77fb63",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Gerg-L", "owner": "Gerg-L",
"ref": "personal",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"type": "github" "type": "github"
} }
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1689326639, "lastModified": 1689605451,
"narHash": "sha256-79zi0t83Dcc2dE0NuYZ+2hqtKXZN1yWVq5mtx8D2d7Y=", "narHash": "sha256-u2qp2k9V1smCfk6rdUcgMKvBj3G9jVvaPHyeXinjN9E=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9fdfaeb7b96f05e869f838c73cde8d98c640c649", "rev": "53657afe29748b3e462f1f892287b7e254c26d77",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -359,11 +358,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1689373857, "lastModified": 1689534811,
"narHash": "sha256-mtBksyvhhT98Zsm9tYHuMKuLwUKDwv+BGTl6K5nOGhY=", "narHash": "sha256-jnSUdzD/414d94plCyNlvTJJtiTogTep6t7ZgIKIHiE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "dfdbcc428f365071f0ca3888f6ec8c25c3792885", "rev": "6cee3b5893090b0f5f0a06b4cf42ca4e60e5d222",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -22,7 +22,7 @@
}; };
spicetify-nix = { spicetify-nix = {
#url = "github:the-argus/spicetify-nix"; #url = "github:the-argus/spicetify-nix";
url = "github:Gerg-L/spicetify-nix/personal"; url = "github:Gerg-L/spicetify-nix";
inputs.nixpkgs.follows = "unstable"; inputs.nixpkgs.follows = "unstable";
}; };
#my own packages #my own packages

3
hosts/gerg-desktop/default.nix
View file

@ -21,8 +21,6 @@
}; };
allowedUnfree = [ allowedUnfree = [
"nvidia-x11" "nvidia-x11"
"steam"
"steam-original"
]; ];
}; };
boot.binfmt.emulatedSystems = ["aarch64-linux"]; boot.binfmt.emulatedSystems = ["aarch64-linux"];
@ -42,7 +40,6 @@
loadInNixShell = false; loadInNixShell = false;
silent = true; silent = true;
}; };
programs.fish.enable = true;
nix.settings.system-features = ["kvm" "big-parallel" "nixos-test" "benchmark"]; nix.settings.system-features = ["kvm" "big-parallel" "nixos-test" "benchmark"];

18
hosts/gerg-desktop/disko.nix
View file

@ -90,31 +90,37 @@ in {
type = "zfs_fs"; type = "zfs_fs";
options.mountpoint = "legacy"; options.mountpoint = "legacy";
mountpoint = "/"; mountpoint = "/";
postCreateHook = "zfs snapshot root@empty"; postCreateHook = ''
zfs snapshot rpool/root@empty
zfs snapshot rpool/root@lastboot
'';
}; };
"nix" = { "nix" = {
type = "zfs_fs"; type = "zfs_fs";
options.mountpoint = "legacy"; options.mountpoint = "legacy";
mountpoint = "/nix"; mountpoint = "/nix";
postCreateHook = "zfs snapshot nix@empty"; postCreateHook = "zfs snapshot rpool/nix@empty";
}; };
"var" = { "var" = {
type = "zfs_fs"; type = "zfs_fs";
options.mountpoint = "legacy"; options.mountpoint = "legacy";
mountpoint = "/var"; mountpoint = "/var";
postCreateHook = "zfs snapshot var@empty"; postCreateHook = ''
zfs snapshot rpool/var@empty
zfs snapshot rpool/var@lastboot
'';
}; };
"persist" = { "persist" = {
type = "zfs_fs"; type = "zfs_fs";
options.mountpoint = "legacy"; options.mountpoint = "legacy";
mountpoint = "/persist"; mountpoint = "/persist";
postCreateHook = "zfs snapshot persist@empty"; postCreateHook = "zfs snapshot rpool/persist@empty";
}; };
"home" = { "home" = {
type = "zfs_fs"; type = "zfs_fs";
options.mountpoint = "legacy"; options.mountpoint = "legacy";
mountpoint = "/home"; mountpoint = "/home";
postCreateHook = "zfs snapshot home@empty"; postCreateHook = "zfs snapshot rpool/home@empty";
}; };
}; };
}; };
@ -141,7 +147,7 @@ in {
type = "zfs_fs"; type = "zfs_fs";
options.mountpoint = "legacy"; options.mountpoint = "legacy";
mountpoint = "/boot"; mountpoint = "/boot";
postCreateHook = "zfs snapshot boot@empty"; postCreateHook = "zfs snapshot bpool/boot@empty";
}; };
}; };
}; };

2
modules/misc.nix
View file

@ -31,7 +31,7 @@ _: {
enable = true; enable = true;
hostKeys = lib.mkForce []; hostKeys = lib.mkForce [];
settings = { settings = {
PermitRootLogin = "yes"; PermitRootLogin = "no";
PasswordAuthentication = false; PasswordAuthentication = false;
KbdInteractiveAuthentication = false; KbdInteractiveAuthentication = false;
}; };

8
modules/nix.nix
View file

@ -1,4 +1,8 @@
inputs: {pkgs, ...}: { inputs: {
pkgs,
config,
...
}: {
#other nix settings #other nix settings
nix = { nix = {
package = inputs.nix.packages.${pkgs.system}.default; package = inputs.nix.packages.${pkgs.system}.default;
@ -24,6 +28,6 @@ inputs: {pkgs, ...}: {
}; };
#fix for use-xdg-base-directories #fix for use-xdg-base-directories
environment.profiles = [ environment.profiles = [
"$HOME/.local/state/nix/profiles/profile" "${config.environment.variables.XDG_STATE_HOME or "$HOME/.local/state"}/nix/profile"
]; ];
} }