diff --git a/flake.lock b/flake.lock index 867b760..78536a9 100644 --- a/flake.lock +++ b/flake.lock @@ -7,30 +7,31 @@ ] }, "locked": { - "lastModified": 1725703823, - "narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", + "lastModified": 1732482255, + "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", "owner": "nix-community", "repo": "home-manager", - "rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", + "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", "repo": "home-manager", "type": "github" } }, "musnix": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1726204062, - "narHash": "sha256-1pzXZEASHnLvVvoowLn/u2ly6CakO6B7kBEC0+DCB+A=", + "lastModified": 1732139495, + "narHash": "sha256-bsL1CZWp5fMDXP6U0Ipwi/XA1YigK9ON+pC7Cxurgec=", "owner": "musnix", "repo": "musnix", - "rev": "7ba77e736ad74b8c942beb5382ff7d0248f68e0b", + "rev": "996b38613a282299c852eca204a10914c6b0074d", "type": "github" }, "original": { @@ -41,74 +42,40 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725634671, - "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", - "owner": "NixOS", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1725762081, - "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1726320982, - "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "root": { "inputs": { "home-manager": "home-manager", "musnix": "musnix", - "nixpkgs": "nixpkgs_2", - "sops-nix": "sops-nix", - "unstable": "unstable" + "nixpkgs": "nixpkgs", + "sops-nix": "sops-nix" } }, "sops-nix": { "inputs": { "nixpkgs": [ "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1726218807, - "narHash": "sha256-z7CoWbSOtsOz8TmRKDnobURkKfv6nPZCo3ayolNuQGc=", + "lastModified": 1732186149, + "narHash": "sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f30b1bac192e2dc252107ac8a59a03ad25e1b96e", + "rev": "53c853fb1a7e4f25f68805ee25c83d5de18dc699", "type": "github" }, "original": { @@ -116,22 +83,6 @@ "repo": "sops-nix", "type": "github" } - }, - "unstable": { - "locked": { - "lastModified": 1726243404, - "narHash": "sha256-sjiGsMh+1cWXb53Tecsm4skyFNag33GPbVgCdfj3n9I=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "345c263f2f53a3710abe117f28a5cb86d0ba4059", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d2a97ea..ced9b10 100644 --- a/flake.nix +++ b/flake.nix @@ -2,12 +2,10 @@ description = "Nixos config flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; - - unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -16,26 +14,21 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - musnix = {url = "github:musnix/musnix";}; + musnix = { + url = "github:musnix/musnix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = { - self, nixpkgs, home-manager, sops-nix, ... } @ inputs: let system = "x86_64-linux"; - unstable = final: prev: { - unstable = import inputs.unstable { - system = final.system; - config = final.config; - }; - }; pkgs = import nixpkgs { inherit system; - overlays = [unstable]; config.allowUnfree = true; }; in { diff --git a/hosts/MaxNixosLaptop/configuration.nix b/hosts/MaxNixosLaptop/configuration.nix index fae5ab0..cada625 100644 --- a/hosts/MaxNixosLaptop/configuration.nix +++ b/hosts/MaxNixosLaptop/configuration.nix @@ -24,7 +24,10 @@ networking.hostName = "MaxNixosLaptop"; # Define your hostname. # NIXOS - nix.settings.experimental-features = ["nix-command" "flakes"]; + nix.settings = { + experimental-features = ["nix-command" "flakes"]; + substituters = ["https://nix-community.cachix.org" "https://cache.nixos.org"]; + }; # Define a user account. Don't forget to set a password with ‘passwd’. users.users.max = { @@ -47,16 +50,16 @@ # $ nix search wget environment.systemPackages = with pkgs; [ bambu-studio - unstable.neovim + neovim wget fprintd qemu quickemu home-manager (let - base = pkgs.appimageTools.defaultFhsEnvArgs; + base = appimageTools.defaultFhsEnvArgs; in - pkgs.buildFHSUserEnv (base + buildFHSUserEnv (base // { name = "fhs"; targetPkgs = pkgs: ( @@ -92,7 +95,7 @@ # }; programs.ssh.startAgent = true; programs.nix-ld.enable = true; - programs.nix-ld.libraries = with pkgs; [ + programs.nix-ld.libraries = [ ]; programs.zsh.enable = true; @@ -116,7 +119,7 @@ ovmf = { enable = true; packages = [ - (pkgs.unstable.OVMF.override { + (pkgs.OVMF.override { secureBoot = true; tpmSupport = true; }) diff --git a/modules/home/programs/default.nix b/modules/home/programs/default.nix index ef20275..b9c4668 100644 --- a/modules/home/programs/default.nix +++ b/modules/home/programs/default.nix @@ -26,8 +26,8 @@ in { xournalpp prismlauncher steam - unstable.blender - unstable.betaflight-configurator + blender + betaflight-configurator loudgain yt-dlp dconf @@ -37,14 +37,14 @@ in { pwvucontrol qpwgraph discord - libreoffice-fresh + # libreoffice-fresh mate.caja libsForQt5.okular mpv gimp freecad wine - gyroflow + # gyroflow prusa-slicer kicad element-desktop diff --git a/modules/home/programs/nextcloud.nix b/modules/home/programs/nextcloud.nix index fd1fdfd..a885cc9 100644 --- a/modules/home/programs/nextcloud.nix +++ b/modules/home/programs/nextcloud.nix @@ -1,7 +1,6 @@ { lib, config, - pkgs, ... }: let cfg = config.myConfig.programs.nextcloud; @@ -11,9 +10,6 @@ in { }; config = lib.mkIf cfg.enable { - services.nextcloud-client = { - enable = true; - package = pkgs.unstable.nextcloud-client; - }; + services.nextcloud-client.enable = true; }; } diff --git a/modules/nixos/gpu/amd.nix b/modules/nixos/gpu/amd.nix index e7845a8..abeb004 100644 --- a/modules/nixos/gpu/amd.nix +++ b/modules/nixos/gpu/amd.nix @@ -18,8 +18,9 @@ in { "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" ]; - hardware.opengl = { + hardware.graphics = { enable = true; + enable32Bit = true; extraPackages = with pkgs; [ rocmPackages.clr.icd amdvlk @@ -27,8 +28,6 @@ in { extraPackages32 = with pkgs; [ driversi686Linux.amdvlk ]; - driSupport = true; - driSupport32Bit = true; }; environment.systemPackages = with pkgs; [ diff --git a/modules/nixos/greetd.nix b/modules/nixos/greetd.nix index 0df897b..6eaa241 100644 --- a/modules/nixos/greetd.nix +++ b/modules/nixos/greetd.nix @@ -26,10 +26,10 @@ in { }; GTK = { application_prefer_dark_theme = true; - cursor_theme_name = "capitaine-cursors-white"; - font_name = "FiraCode Nerd Font 20"; - icon_theme_name = "WhiteSur-dark"; - theme_name = "WhiteSur-Dark"; + cursor_theme_name = lib.mkForce "capitaine-cursors-white"; + font_name = lib.mkForce "FiraCode Nerd Font 20"; + icon_theme_name = lib.mkForce "WhiteSur-dark"; + theme_name = lib.mkForce "WhiteSur-Dark"; }; commands = { reboot = ["systemctl" "reboot"]; diff --git a/modules/nixos/music.nix b/modules/nixos/music.nix index 874571b..33eb012 100644 --- a/modules/nixos/music.nix +++ b/modules/nixos/music.nix @@ -11,15 +11,14 @@ in { }; config = lib.mkIf cfg.enable { - musnix = { - enable = true; - rtcqs.enable = true; - kernel.realtime = true; - kernel.packages = pkgs.linuxPackages-rt_latest; - }; + # musnix = { + # enable = true; + # rtcqs.enable = true; + # kernel.realtime = true; + # kernel.packages = pkgs.linuxPackages-rt_latest; + # }; users.users.max.extraGroups = ["audio"]; - sound.enable = true; services.pipewire = { enable = true; alsa.enable = true;