kopatz/nix-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update flake

Browse Source
This commit is contained in:
Kopatz
2024-06-29 19:37:37 +02:00
parent df1aac5278
commit 12e275bb04
7 changed files with 68 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
flake.lock generated
View File

@@ -202,11 +202,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718846788, "lastModified": 1719640067,
"narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=", "narHash": "sha256-ZEJFGHnElbMH3JgnFANxOlJgniFamu9MemvHCMQZtpA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e", "rev": "423b86a7f756421325e71663ada79a199bf13408",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -398,11 +398,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717664902, "lastModified": 1719259945,
"narHash": "sha256-7XfBuLULizXjXfBYy/VV+SpYMHreNRHk9nKMsm1bgb4=", "narHash": "sha256-F1h+XIsGKT9TkGO3omxDLEb/9jOOsI6NnzsXFsZhry4=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "cc4d466cb1254af050ff7bdf47f6d404a7c646d1", "rev": "0ff4381bbb8f7a52ca4a851660fc7a437a4c6e07",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -478,11 +478,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718788307, "lastModified": 1719677234,
"narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=", "narHash": "sha256-qO9WZsj/0E6zcK4Ht1y/iJ8XfwbBzq7xdqhBh44OP/M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca", "rev": "36317d4d38887f7629876b0e43c8d9593c5cc48d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -521,11 +521,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718526747, "lastModified": 1719588253,
"narHash": "sha256-sKrD/utGvmtQALvuDj4j0CT3AJXP1idOAq2p+27TpeE=", "narHash": "sha256-A03i8xiVgP14DCmV5P7VUv37eodCjY4e1iai0b2EuuM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0a7ffb28e5df5844d0e8039c9833d7075cdee792", "rev": "7e68e55d2e16d3a1e92a679430728c35a30fd24e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -582,11 +582,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718662658, "lastModified": 1719128254,
"narHash": "sha256-AKG7BsqtVWDlefgzyKz7vjaKTLi4+bmTSBhowbQoZtM=", "narHash": "sha256-I7jMpq0CAOZA/i70+HDQO/ulLttyQu/K70cSESiMX7A=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "29b3096a6e283d7e6779187244cb2a3942239fdf", "rev": "50581970f37f06a4719001735828519925ef8310",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -604,11 +604,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1718689703, "lastModified": 1719624901,
"narHash": "sha256-XKUFuHOtyuG9l85cDYXzIfhazHhatL+XJPGTnyfeQJM=", "narHash": "sha256-XBFFLLBpG7+63g3BzR5dMiDpXPQ81bhe6wNAki4jmkM=",
"owner": "lilyinstarlight", "owner": "lilyinstarlight",
"repo": "nixos-cosmic", "repo": "nixos-cosmic",
"rev": "88b214961958d6748295417aed58c9657d3907f5", "rev": "ecec4c9e94f4a7d0e7945d471c4792dc370c3d45",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -619,11 +619,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1718883385, "lastModified": 1719647737,
"narHash": "sha256-nLKMEZc6im82lfSdVPIBwff8OEYLlGVPpcZPvtpOFx4=", "narHash": "sha256-OvX/qQQ33zyB5ReRzm+U5+9Hh6EeYxHdd21tXL3p/eY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "0307a32b553f81056edd6455168c635aeda6743b", "rev": "231274268ff2250d4730e274b808f66ef91b6381",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -642,11 +642,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718710563, "lastModified": 1719220171,
"narHash": "sha256-O4rrM0Bkh3IRe8D600iniQ52QTmlnuTSp2KyXV7C2jE=", "narHash": "sha256-xywM6JoGT8AwfoOFJBTv8GRlvNu8LYqqqMS/OQ6uCgE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "2fb93bea657ad99a7005ef601c67cb2820560a41", "rev": "269411cfed6aab694e46f719277c972de96177bb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -688,11 +688,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1718437845, "lastModified": 1719426051,
"narHash": "sha256-ZT7Oc1g4I4pHVGGjQFnewFVDRLH5cIZhEzODLz9YXeY=", "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "752c634c09ceb50c45e751f8791cb45cb3d46c9e", "rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -704,11 +704,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1718714799, "lastModified": 1719506693,
"narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=", "narHash": "sha256-C8e9S7RzshSdHB7L+v9I51af1gDM5unhJ2xO1ywxNH8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e", "rev": "b2852eb9365c6de48ffb0dc2c9562591f652242a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -719,11 +719,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1718717462, "lastModified": 1719426051,
"narHash": "sha256-qddfQLMaWR2gxfEzUM/zFZVK6H1kTv9WBQSBQxbP3MU=", "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "938aa157bbd6e3c6fd7dcb77998b1f92c2ad1631", "rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -763,11 +763,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1718869672, "lastModified": 1719666075,
"narHash": "sha256-artyEBzWUsNXtYj7jBr816wRJj2Y3DYDHw6ECrQotX0=", "narHash": "sha256-65P3TcZi0s+dOc9uG6/+3bO3/IhG71RDjbkF44HjIfs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "744dfea48bdd331e66b9e874822559fa6fae98af", "rev": "049bbc168fe449cca37ddf3b0b56c4f93408052b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -778,11 +778,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1718888344, "lastModified": 1719675884,
"narHash": "sha256-oTBibb33dkYYy9mCnAG81tOda+519HUFlFqK7b4XUms=", "narHash": "sha256-ID92f3bDV2IfPvXNxGf5hDMHkcyYVXYXRBP1GSxUw/I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "821b0a194df0dbf290b19c910039dc2a758bcd4d", "rev": "b4142be78e0e998796d0b32101994b84c7bbae68",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -824,11 +824,11 @@
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1718789425, "lastModified": 1719525570,
"narHash": "sha256-YJvgBThIUPeywoTjnFk+F73c0l2oaAENIrz2uldqb5A=", "narHash": "sha256-xSO/H67GAHEW0siD2PHoO/e97MbROL3r3s5SpF6A6Dc=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "7dcab0711bfc103a1fb05ba643ee7a3bd309fbe4", "rev": "1ff9d37d27377bfe8994c24a8d6c6c1734ffa116",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -905,11 +905,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718522839, "lastModified": 1719243788,
"narHash": "sha256-ULzoKzEaBOiLRtjeY3YoGFJMwWSKRYOic6VNw2UyTls=", "narHash": "sha256-9T9mSY35EZSM1KAwb7K9zwQ78qTlLjosZgtUGnw4rn4=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "68eb1dc333ce82d0ab0c0357363ea17c31ea1f81", "rev": "065a23edceff48f948816b795ea8cc6c0dee7cdf",
"type": "github" "type": "github"
}, },
"original": { "original": {

8
flake.nix
View File

@@ -88,6 +88,7 @@
vars = import ./systems/userdata-default.nix vars = import ./systems/userdata-default.nix
// import ./systems/server/userdata.nix; // import ./systems/server/userdata.nix;
pkgsVersion = nixpkgs; pkgsVersion = nixpkgs;
home-manager-version = home-manager;
}; };
}; };
"kop-pc" = mkHost { "kop-pc" = mkHost {
@@ -122,14 +123,13 @@
}; };
"mini-pc" = mkHost { "mini-pc" = mkHost {
specialArgs = { specialArgs = {
vars = import ./systems/userdata-default.nix;
pkgsVersion = nixpkgs; pkgsVersion = nixpkgs;
home-manager-version = home-manager;
}; };
modules = [ ./users/anon ./systems/mini-pc/configuration.nix ]; modules = [ ./users/anon ./systems/mini-pc/configuration.nix ];
}; };
"mini-pc-proxmox" = mkHost { "mini-pc-proxmox" = mkHost {
specialArgs = { specialArgs = {
vars = import ./systems/userdata-default.nix;
pkgsVersion = nixpkgs; pkgsVersion = nixpkgs;
home-manager-version = home-manager; home-manager-version = home-manager;
}; };
@@ -137,10 +137,6 @@
}; };
# build vm -> nixos-rebuild build-vm --flake .#vm # build vm -> nixos-rebuild build-vm --flake .#vm
"vm" = mkHost { "vm" = mkHost {
specialArgs = {
vars = import ./systems/userdata-default.nix;
pkgsVersion = nixpkgs-unstable;
};
modules = [ ./users/vm ./systems/vm/configuration.nix ]; modules = [ ./users/vm ./systems/vm/configuration.nix ];
}; };
"wsl" = mkHost { "wsl" = mkHost {

1
modules/graphical/cosmic.nix
View File

@@ -16,7 +16,6 @@ in
boot.kernelParams = [ "nvidia_drm.fbdev=1" ]; boot.kernelParams = [ "nvidia_drm.fbdev=1" ];
services.desktopManager.cosmic.enable = true; services.desktopManager.cosmic.enable = true;
services.displayManager.cosmic-greeter.enable = true; services.displayManager.cosmic-greeter.enable = true;
}; };
} }

3
modules/hardware/nvidia.nix
View File

@@ -8,9 +8,8 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
# Enable OpenGL # Enable OpenGL
hardware.opengl = { hardware.graphics = {
enable = true; enable = true;
driSupport = true;
driSupport32Bit = true; driSupport32Bit = true;
}; };

12
modules/services/syncthing.nix
View File

@@ -54,25 +54,29 @@ in {
addresses = [ "tcp://192.168.0.15" "tcp://192.168.2.20" ]; addresses = [ "tcp://192.168.0.15" "tcp://192.168.2.20" ];
}; };
}; };
folders."${basePath}/default" = { folders."default" = {
id = "default"; id = "default";
path = "${basePath}/default";
devices = devices =
[ "kop-pc" "server" "laptop" "mini-pc" "mini-pc-proxmox" "phone" ]; [ "kop-pc" "server" "laptop" "mini-pc" "mini-pc-proxmox" "phone" ];
ignorePerms = false; ignorePerms = false;
}; };
folders."${basePath}/books" = { folders."books" = {
id = "books"; id = "books";
path = "${basePath}/books";
devices = [ "kop-pc" "server" "laptop" "mini-pc" "mini-pc-proxmox" ]; devices = [ "kop-pc" "server" "laptop" "mini-pc" "mini-pc-proxmox" ];
}; };
folders."${basePath}/fh" = { folders."fh" = {
id = "fh"; id = "fh";
path = "${basePath}/fh";
devices = [ "kop-pc" "server" "laptop" "mini-pc" "mini-pc-proxmox" ]; devices = [ "kop-pc" "server" "laptop" "mini-pc" "mini-pc-proxmox" ];
}; };
folders."${basePath}/work_drive" = { folders."work_drive" = {
id = "work_drive"; id = "work_drive";
path = "${basePath}/work_drive";
devices = [ "kop-pc" "server" "laptop" "mini-pc" "mini-pc-proxmox" ]; devices = [ "kop-pc" "server" "laptop" "mini-pc" "mini-pc-proxmox" ];
}; };
}; };

4
systems/pc/configuration.nix
View File

@@ -65,13 +65,13 @@
i3.enable = true; i3.enable = true;
#hyprland.enable = true; #hyprland.enable = true;
#gnome.enable = true; #gnome.enable = true;
#cosmic.enable = true; cosmic.enable = true;
shared.enable = true; shared.enable = true;
stylix.enable = true; stylix.enable = true;
}; };
}; };
nixpkgs.config.permittedInsecurePackages = [ "electron-27.3.11" ]; nixpkgs.config.permittedInsecurePackages = [ "electron-28.3.3" ];
mainUser.layout = "de"; mainUser.layout = "de";
mainUser.variant = "us"; mainUser.variant = "us";

14
systems/vm/configuration.nix
View File

@@ -1,6 +1,6 @@
{ pkgs, config, lib, ... }: { { pkgs, config, lib, modulesPath, ... }: {
imports = [ ./vm-common.nix ]; imports = [ ./vm-common.nix (modulesPath + "/profiles/qemu-guest.nix") ];
age.identityPaths = [ /home/kopatz/.ssh/id_rsa ]; age.identityPaths = [ /home/kopatz/.ssh/id_rsa ];
mainUser.layout = "de"; mainUser.layout = "de";
mainUser.variant = "us"; mainUser.variant = "us";
@@ -17,12 +17,18 @@
settings.enable = true; settings.enable = true;
}; };
graphical = { graphical = {
i3.enable = true; #i3.enable = true;
plasma.enable = true; plasma.enable = true;
lightdm.enable = true; #lightdm.enable = true;
#sddm.enable = true;
#cosmic.enable = true;
}; };
}; };
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
virtualisation.vmVariant = {
virtualisation.qemu.options = [ "-vga qxl" ];
#[ "-vga none" "-device virtio-gpu-gl-pci" "-display default,gl=on" ];
};
environment.systemPackages = with pkgs; [ firefox ]; environment.systemPackages = with pkgs; [ firefox ];