diff --git a/etc/nixos/configuration.nix b/etc/nixos/configuration.nix index 5c7820d..065ebe2 100644 --- a/etc/nixos/configuration.nix +++ b/etc/nixos/configuration.nix @@ -186,7 +186,7 @@ in environmentVariables = { CUDA_VISIBLE_DEVICES = "0"; NVIDIA_VISIBLE_DEVICES = "all"; - LD_LIBRARY_PATH = "${pkgs.cudaPackages.cudatoolkit}/lib:${pkgs.cudaPackages.cudatoolkit}/lib64"; + LD_LIBRARY_PATH = "${pkgs-unstable.cudaPackages.cudatoolkit}/lib:${pkgs-unstable.cudaPackages.cudatoolkit}/lib64"; }; }; diff --git a/etc/nixos/flake.lock b/etc/nixos/flake.lock new file mode 100644 index 0000000..ba6d4c4 --- /dev/null +++ b/etc/nixos/flake.lock @@ -0,0 +1,168 @@ +{ + "nodes": { + "niri": { + "inputs": { + "niri-stable": "niri-stable", + "niri-unstable": "niri-unstable", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable", + "xwayland-satellite-stable": "xwayland-satellite-stable", + "xwayland-satellite-unstable": "xwayland-satellite-unstable" + }, + "locked": { + "lastModified": 1762194159, + "narHash": "sha256-VoePQ5iYfnYYqRLGC6F6Q0bmNNCiAsw369se+xOeb6g=", + "owner": "sodiboo", + "repo": "niri-flake", + "rev": "164d48e15914f35fda52f4216b475199cae9ac1a", + "type": "github" + }, + "original": { + "owner": "sodiboo", + "repo": "niri-flake", + "type": "github" + } + }, + "niri-stable": { + "flake": false, + "locked": { + "lastModified": 1756556321, + "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "ref": "v25.08", + "repo": "niri", + "type": "github" + } + }, + "niri-unstable": { + "flake": false, + "locked": { + "lastModified": 1762146685, + "narHash": "sha256-anRlNG6t7esBbF1+ALDeathVBSclA0PEL52Vo0WnN5g=", + "owner": "YaLTeR", + "repo": "niri", + "rev": "a2ca2b3c866bc781b12c334a9f949b3db6d7c943", + "type": "github" + }, + "original": { + "owner": "YaLTeR", + "repo": "niri", + "type": "github" + } + }, + "nix-flatpak": { + "locked": { + "lastModified": 1754777568, + "narHash": "sha256-0bBqT+3XncgF8F03RFAamw9vdf0VmaDoIJLTGkjfQZs=", + "owner": "gmodena", + "repo": "nix-flatpak", + "rev": "62f636b87ef6050760a8cb325cadb90674d1e23e", + "type": "github" + }, + "original": { + "owner": "gmodena", + "repo": "nix-flatpak", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1761999846, + "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1761999846, + "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1762111121, + "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "niri": "niri", + "nix-flatpak": "nix-flatpak", + "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable" + } + }, + "xwayland-satellite-stable": { + "flake": false, + "locked": { + "lastModified": 1755491097, + "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "388d291e82ffbc73be18169d39470f340707edaa", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "ref": "v0.7", + "repo": "xwayland-satellite", + "type": "github" + } + }, + "xwayland-satellite-unstable": { + "flake": false, + "locked": { + "lastModified": 1761622056, + "narHash": "sha256-fBrUszJXmB4MY+wf3QsCnqWHcz7u7fLq0QMAWCltIQg=", + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "rev": "0728d59ff6463a502e001fb090f6eb92dbc04756", + "type": "github" + }, + "original": { + "owner": "Supreeeme", + "repo": "xwayland-satellite", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/etc/nixos/flake.nix b/etc/nixos/flake.nix index a56cba3..21ee831 100644 --- a/etc/nixos/flake.nix +++ b/etc/nixos/flake.nix @@ -5,9 +5,13 @@ nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-25.05"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nix-flatpak.url = "github:gmodena/nix-flatpak"; + niri = { + url = "github:sodiboo/niri-flake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - outputs = { self, nixpkgs, nixpkgs-unstable, nix-flatpak, ... } @inputs: + outputs = { self, nixpkgs, nixpkgs-unstable, nix-flatpak, niri, ... } @inputs: let system = "x86_64-linux"; @@ -32,6 +36,7 @@ inherit pkgs-unstable; }; modules = [ + niri.nixosModules.niri nix-flatpak.nixosModules.nix-flatpak ./configuration.nix ]; diff --git a/etc/nixos/modules/desktop.nix b/etc/nixos/modules/desktop.nix index 0d18538..10e67b7 100644 --- a/etc/nixos/modules/desktop.nix +++ b/etc/nixos/modules/desktop.nix @@ -2,7 +2,7 @@ #░█░█░█▀▀░▀▀█░█▀▄░░█░░█░█░█▀▀ #░▀▀░░▀▀▀░▀▀▀░▀░▀░░▀░░▀▀▀░▀░░ -{config, pkgs, pkgs-unstable, lib, ... }: +{config, pkgs, pkgs-unstable, lib, inputs, ... }: { # Enable GDM @@ -29,7 +29,9 @@ }; # NIRI # + nixpkgs.overlays = [ inputs.niri.overlays.niri ]; programs.niri = { + package = pkgs.niri-unstable; enable = true; }; diff --git a/etc/nixos/modules/nvidia.nix b/etc/nixos/modules/nvidia.nix index cd706af..45fcb2e 100644 --- a/etc/nixos/modules/nvidia.nix +++ b/etc/nixos/modules/nvidia.nix @@ -1,6 +1,5 @@ { config, pkgs, lib, ... }: - { boot = { kernelParams = [ @@ -13,7 +12,7 @@ }; services.xserver.videoDrivers = ["nvidia"]; - + hardware = { nvidia = { modesetting.enable = true; diff --git a/etc/nixos/modules/programs.nix b/etc/nixos/modules/programs.nix index 08ed7ac..5d5da20 100644 --- a/etc/nixos/modules/programs.nix +++ b/etc/nixos/modules/programs.nix @@ -69,7 +69,6 @@ gnome-text-editor gnome-calculator simple-scan - anydesk # PRODUCTION # pinta @@ -96,7 +95,7 @@ vscode-fhs nixd nil - zed-editor + pkgs-unstable.zed-editor gnumake cmake ninja @@ -160,6 +159,7 @@ "org.onlyoffice.desktopeditors" "com.rustdesk.RustDesk" "org.gimp.GIMP" + "com.anydesk.Anydesk" ];