From 63af29b6e6902ed7dd2dd30d0b7f81a7b03ba247 Mon Sep 17 00:00:00 2001 From: Nicole Date: Mon, 17 Nov 2025 15:31:30 +0100 Subject: [PATCH] Update --- etc/nixos/configuration.nix | 4 + etc/nixos/flake.lock | 231 ++++++++++++++++++++++++++++++--- etc/nixos/flake.nix | 3 + etc/nixos/modules/desktop.nix | 46 +++---- etc/nixos/modules/programs.nix | 8 +- 5 files changed, 246 insertions(+), 46 deletions(-) diff --git a/etc/nixos/configuration.nix b/etc/nixos/configuration.nix index 2cc0cf8..4083885 100644 --- a/etc/nixos/configuration.nix +++ b/etc/nixos/configuration.nix @@ -57,6 +57,10 @@ in "rd.udev.log_level=0" "udev.log_priority=3" ]; + kernel.sysctl = { + "vm.max_map_count" = 16777216; + "fs.file-max" = 524288; + }; kernelPackages = pkgs.linuxPackages_zen; diff --git a/etc/nixos/flake.lock b/etc/nixos/flake.lock index 123cc7b..b1f7b03 100644 --- a/etc/nixos/flake.lock +++ b/etc/nixos/flake.lock @@ -1,5 +1,44 @@ { "nodes": { + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nix-citizen", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1762980239, + "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1762980239, + "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "niri": { "inputs": { "niri-stable": "niri-stable", @@ -12,11 +51,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1762810134, - "narHash": "sha256-eu8Gkb/y/5pRS3Ml/sg3oeUtFFzlJMpDrJRgPgOXz38=", + "lastModified": 1763289873, + "narHash": "sha256-vzVbMit/Y8IdSYiN2jal77Bp0uRw3MNqSoqy0l4dYoo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "44c5a2c19b7b22d1b2375ef95f656291a0af3a1b", + "rev": "13d47ed15fc3d8cc98ad42525e85851faf15a47c", "type": "github" }, "original": { @@ -45,11 +84,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1762804232, - "narHash": "sha256-LCddK36/6u73jed1yuqbu6JKWIITsc42qoM883DgwJg=", + "lastModified": 1763286485, + "narHash": "sha256-noCCGXkqQxHT+Pk723/poMqkbLHPtgENwg/kntlh2mA=", "owner": "YaLTeR", "repo": "niri", - "rev": "978c4e6c8afc0199e2cbd9037bdc7c41fbbab2a3", + "rev": "9dad215b9f384310dea53fbd1aa8010e42f779f4", "type": "github" }, "original": { @@ -58,6 +97,31 @@ "type": "github" } }, + "nix-citizen": { + "inputs": { + "flake-parts": "flake-parts", + "nix-gaming": [ + "nix-gaming" + ], + "nix-github-actions": "nix-github-actions", + "nixpkgs": "nixpkgs", + "systems": "systems", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1763104254, + "narHash": "sha256-FJ7zQljNkR4I9ef9dYHeXpOPSXKHnYcuY+sasUn3jr4=", + "owner": "LovingMelody", + "repo": "nix-citizen", + "rev": "00c1459bd246fed304dada9d1a16c23faa213116", + "type": "github" + }, + "original": { + "owner": "LovingMelody", + "repo": "nix-citizen", + "type": "github" + } + }, "nix-flatpak": { "locked": { "lastModified": 1754777568, @@ -73,29 +137,84 @@ "type": "github" } }, - "nixpkgs": { + "nix-gaming": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": "nixpkgs_2" + }, "locked": { - "lastModified": 1762756533, - "narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d", + "lastModified": 1763313066, + "narHash": "sha256-i2s3jPiMRPLd1mcL0oNMSbrbmq9ba/Qo4YPVPehPmEs=", + "owner": "fufexan", + "repo": "nix-gaming", + "rev": "dfa5f946fe41f085e34159a818790f69a19a0022", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-25.05", + "owner": "fufexan", + "repo": "nix-gaming", + "type": "github" + } + }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "nix-citizen", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1737420293, + "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "owner": "NixOS", "repo": "nixpkgs", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1761765539, + "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", "type": "github" } }, "nixpkgs-stable": { "locked": { - "lastModified": 1762756533, - "narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=", + "lastModified": 1763049705, + "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d", + "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", "type": "github" }, "original": { @@ -107,11 +226,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1762596750, - "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "type": "github" }, "original": { @@ -121,14 +240,84 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1763191728, + "narHash": "sha256-esRhOS0APE6k40Hs/jjReXg+rx+J5LkWw7cuWFKlwYA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1763049705, + "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "niri": "niri", + "nix-citizen": "nix-citizen", "nix-flatpak": "nix-flatpak", - "nixpkgs": "nixpkgs", + "nix-gaming": "nix-gaming", + "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable" } }, + "systems": { + "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": [ + "nix-citizen", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1762938485, + "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "xwayland-satellite-stable": { "flake": false, "locked": { diff --git a/etc/nixos/flake.nix b/etc/nixos/flake.nix index 21ee831..0c8d3e2 100644 --- a/etc/nixos/flake.nix +++ b/etc/nixos/flake.nix @@ -9,6 +9,9 @@ url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-citizen.url = "github:LovingMelody/nix-citizen"; + nix-gaming.url = "github:fufexan/nix-gaming"; + nix-citizen.inputs.nix-gaming.follows = "nix-gaming"; }; outputs = { self, nixpkgs, nixpkgs-unstable, nix-flatpak, niri, ... } @inputs: diff --git a/etc/nixos/modules/desktop.nix b/etc/nixos/modules/desktop.nix index d45a896..0f49973 100644 --- a/etc/nixos/modules/desktop.nix +++ b/etc/nixos/modules/desktop.nix @@ -39,11 +39,11 @@ wantedBy = [ "multi-user.target" ]; services.gnome.gnome-keyring.enable = true; # HYPRLAND # - programs.hyprland = { - enable = true; - withUWSM = true; - xwayland.enable = true; - }; + #programs.hyprland = { + # enable = true; + # withUWSM = true; + # xwayland.enable = true; + #}; # NIRI # #nixpkgs.overlays = [ inputs.niri.overlays.niri ]; @@ -73,25 +73,25 @@ wantedBy = [ "multi-user.target" ]; #}; # GNOME - #services.xserver.desktopManager.gnome.enable = true; - #environment.gnome.excludePackages = with pkgs; [ - # baobab # disk usage analyzer - # cheese # photo booth - # eog # image viewer - # epiphany # web browser - # gedit # text editor - # simple-scan # document scanner - # totem # video player - # yelp # help viewer - # evince # document viewer - # file-roller # archive manager - # geary # email client - # seahorse # password manager + services.xserver.desktopManager.gnome.enable = true; + environment.gnome.excludePackages = with pkgs; [ + baobab # disk usage analyzer + cheese # photo booth + eog # image viewer + epiphany # web browser + gedit # text editor + simple-scan # document scanner + totem # video player + yelp # help viewer + evince # document viewer + file-roller # archive manager + geary # email client + seahorse # password manager - # gnome-calculator gnome-calendar gnome-characters gnome-clocks gnome-contacts - # gnome-font-viewer gnome-logs gnome-maps gnome-music gnome-photos gnome-screenshot - # gnome-system-monitor gnome-weather gnome-disk-utility pkgs.gnome-connections - #]; + gnome-calculator gnome-calendar gnome-characters gnome-clocks gnome-contacts + gnome-font-viewer gnome-logs gnome-maps gnome-music gnome-photos gnome-screenshot + gnome-system-monitor gnome-weather gnome-disk-utility pkgs.gnome-connections + ]; environment.sessionVariables = { WLR_NO_HARDWARE_CURSOR = "1"; diff --git a/etc/nixos/modules/programs.nix b/etc/nixos/modules/programs.nix index 6aa89e3..81152d8 100644 --- a/etc/nixos/modules/programs.nix +++ b/etc/nixos/modules/programs.nix @@ -2,7 +2,7 @@ #░█▀▀░█▀█░█░░░█▀▄░█▀█░█░█░█▀▀░▀▀█ #░▀░░░▀░▀░▀▀▀░▀░▀░▀░▀░▀▀▀░▀▀▀░▀▀▀ -{config, pkgs, pkgs-unstable, lib, ... }: +{config, pkgs, pkgs-unstable, lib, inputs, ... }: { @@ -101,6 +101,7 @@ ninja libgcc gcc + uv # GAMING # mangohud @@ -132,7 +133,11 @@ cudaPackages.cuda_cudart # AI # + (callPackage ./pkgs/msty/default.nix {}) pkgs-unstable.jan + claude-code + pkgs-unstable.lmstudio + pkgs-unstable.opencode # AUDIO AND DAW# helvum @@ -148,7 +153,6 @@ wineWowPackages.stable winetricks - (callPackage ./pkgs/msty/default.nix {}) ]; # Enable Flaktpak