From 82ebc6a78e89871aa3c3b38a5eea4260b7c85a77 Mon Sep 17 00:00:00 2001 From: Nicole Date: Mon, 24 Nov 2025 23:02:26 +0100 Subject: [PATCH] Update --- etc/nixos/configuration.nix | 2 +- etc/nixos/flake.lock | 97 +++++++++++++++++++++++----------- etc/nixos/flake.nix | 3 +- etc/nixos/modules/desktop.nix | 36 ++++++------- etc/nixos/modules/programs.nix | 14 +++-- 5 files changed, 98 insertions(+), 54 deletions(-) diff --git a/etc/nixos/configuration.nix b/etc/nixos/configuration.nix index 4083885..dd5adab 100644 --- a/etc/nixos/configuration.nix +++ b/etc/nixos/configuration.nix @@ -121,7 +121,7 @@ in users.users.nicole = { isNormalUser = true; description = "Nicole"; - extraGroups = [ "networkmanager" "wheel" "libvrtd" "kvm" "qemu-libvirtd" "cdrom" ]; + extraGroups = [ "networkmanager" "wheel" "libvrtd" "kvm" "qemu-libvirtd" "cdrom" "uucp" "docker" ]; packages = with pkgs; []; }; diff --git a/etc/nixos/flake.lock b/etc/nixos/flake.lock index b1f7b03..2a905c3 100644 --- a/etc/nixos/flake.lock +++ b/etc/nixos/flake.lock @@ -26,11 +26,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1762980239, - "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -51,11 +51,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1763289873, - "narHash": "sha256-vzVbMit/Y8IdSYiN2jal77Bp0uRw3MNqSoqy0l4dYoo=", + "lastModified": 1763995371, + "narHash": "sha256-Cbekq2OAWevdTayYMO7SCf05aGHPZ236MTyCkKyYZOs=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "13d47ed15fc3d8cc98ad42525e85851faf15a47c", + "rev": "c4fb0f9d13fadf1b3c33e693509d8cdcbbd7d08e", "type": "github" }, "original": { @@ -84,11 +84,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1763286485, - "narHash": "sha256-noCCGXkqQxHT+Pk723/poMqkbLHPtgENwg/kntlh2mA=", + "lastModified": 1763990232, + "narHash": "sha256-RdtlZ+nufSwEgNsF0yuTOO2eGpn87Qm9b3tRQPsibH4=", "owner": "YaLTeR", "repo": "niri", - "rev": "9dad215b9f384310dea53fbd1aa8010e42f779f4", + "rev": "45b45ac29d654c0e6759ab996c69dfde40053536", "type": "github" }, "original": { @@ -109,11 +109,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1763104254, - "narHash": "sha256-FJ7zQljNkR4I9ef9dYHeXpOPSXKHnYcuY+sasUn3jr4=", + "lastModified": 1763920364, + "narHash": "sha256-tjwvIt0DfCPO3ICod6++Nx2qrVVNc0EoSN7t9wgBtMA=", "owner": "LovingMelody", "repo": "nix-citizen", - "rev": "00c1459bd246fed304dada9d1a16c23faa213116", + "rev": "9437e64a0632f7048b3a9e6100a0b3c293c04e64", "type": "github" }, "original": { @@ -143,11 +143,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1763313066, - "narHash": "sha256-i2s3jPiMRPLd1mcL0oNMSbrbmq9ba/Qo4YPVPehPmEs=", + "lastModified": 1763949820, + "narHash": "sha256-nN+Ebv2czqqMFIpH1/VfrjoaHzZTxTE/diuLhw1HqPQ=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "dfa5f946fe41f085e34159a818790f69a19a0022", + "rev": "faa39649d0ad7e11bfcb7887ccda478515e489e8", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1763049705, - "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", + "lastModified": 1763622513, + "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", + "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", "type": "github" }, "original": { @@ -226,11 +226,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1763835633, + "narHash": "sha256-HzxeGVID5MChuCPESuC0dlQL1/scDKu+MmzoVBJxulM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "050e09e091117c3d7328c7b2b7b577492c43c134", "type": "github" }, "original": { @@ -242,11 +242,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1763191728, - "narHash": "sha256-esRhOS0APE6k40Hs/jjReXg+rx+J5LkWw7cuWFKlwYA=", + "lastModified": 1763618868, + "narHash": "sha256-v5afmLjn/uyD9EQuPBn7nZuaZVV9r+JerayK/4wvdWA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c", + "rev": "a8d610af3f1a5fb71e23e08434d8d61a466fc942", "type": "github" }, "original": { @@ -258,11 +258,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1763049705, - "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", + "lastModified": 1763622513, + "narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", + "rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b", "type": "github" }, "original": { @@ -272,6 +272,40 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1763806073, + "narHash": "sha256-FHsEKDvfWpzdADWj99z7vBk4D716Ujdyveo5+A048aI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "878e468e02bfabeda08c79250f7ad583037f2227", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "opencode": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1763985874, + "narHash": "sha256-UgfjDfWV/uAa/GGThFx4Sbf1nb/CPlM+NisAsdU+Vn4=", + "owner": "sst", + "repo": "opencode", + "rev": "e6bf1754c33490570f9103c6cf3849bc4ec68296", + "type": "github" + }, + "original": { + "owner": "sst", + "repo": "opencode", + "type": "github" + } + }, "root": { "inputs": { "niri": "niri", @@ -279,7 +313,8 @@ "nix-flatpak": "nix-flatpak", "nix-gaming": "nix-gaming", "nixpkgs": "nixpkgs_3", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs-unstable": "nixpkgs-unstable", + "opencode": "opencode" } }, "systems": { @@ -338,11 +373,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1762747449, - "narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=", + "lastModified": 1763704521, + "narHash": "sha256-ceYEV6PnvUN8Zixao4gpPuN+VT3B0SlAXKuPNHZhqUY=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "6338574bc5c036487486acde264f38f39ea15fad", + "rev": "f379ff5722a821212eb59ada9cf8e51cb3654aad", "type": "github" }, "original": { diff --git a/etc/nixos/flake.nix b/etc/nixos/flake.nix index 0c8d3e2..8bb30d9 100644 --- a/etc/nixos/flake.nix +++ b/etc/nixos/flake.nix @@ -12,9 +12,10 @@ nix-citizen.url = "github:LovingMelody/nix-citizen"; nix-gaming.url = "github:fufexan/nix-gaming"; nix-citizen.inputs.nix-gaming.follows = "nix-gaming"; + opencode.url = "github:sst/opencode"; }; - outputs = { self, nixpkgs, nixpkgs-unstable, nix-flatpak, niri, ... } @inputs: + outputs = { self, nixpkgs, nixpkgs-unstable, nix-flatpak, niri, opencode, ... } @inputs: let system = "x86_64-linux"; diff --git a/etc/nixos/modules/desktop.nix b/etc/nixos/modules/desktop.nix index 0f49973..777e7da 100644 --- a/etc/nixos/modules/desktop.nix +++ b/etc/nixos/modules/desktop.nix @@ -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 81152d8..142131a 100644 --- a/etc/nixos/modules/programs.nix +++ b/etc/nixos/modules/programs.nix @@ -76,7 +76,6 @@ # MEDIA # ffmpeg mpv - jellyfin-media-player feishin spotify @@ -102,6 +101,7 @@ libgcc gcc uv + nodejs_24 # GAMING # mangohud @@ -132,12 +132,14 @@ cudaPackages.cudnn cudaPackages.cuda_cudart - # AI # + # (callPackage ./pkgs/msty/default.nix {}) pkgs-unstable.jan claude-code pkgs-unstable.lmstudio - pkgs-unstable.opencode + (inputs.opencode.packages.${system}.default) + pkgs-unstable.codex + pkgs-unstable.gemini-cli # AUDIO AND DAW# helvum @@ -165,9 +167,15 @@ "com.rustdesk.RustDesk" "org.gimp.GIMP" "com.anydesk.Anydesk" + "com.github.iwalton3.jellyfin-media-player" ]; services.hardware.openrgb.enable = true; +virtualisation.docker.rootless = { + enable = true; + setSocketVariable = true; +}; + }