diff --git a/flake.lock b/flake.lock index 6324dcf..fbfe3f2 100644 --- a/flake.lock +++ b/flake.lock @@ -5,16 +5,17 @@ "compare-to": "compare-to", "flake-schemas": "flake-schemas", "home-manager": "home-manager", + "jovian": "jovian", "nixpkgs": "nixpkgs", "systems": "systems", "yafas": "yafas" }, "locked": { - "lastModified": 1706183550, - "narHash": "sha256-06BQrrPZDsnFL7WLUveDkKk1ZVxAnmc6mFNP4Vb84qY=", + "lastModified": 1706798619, + "narHash": "sha256-U2UYfVYjX3bXnAsv3C98yWcDDlQVmk2eCB0XxDzA20o=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "5c1df57391b39bf0880e7b3b9209e4f37e19fcde", + "rev": "82f97c8aa5b842be752e65933901cb20506a90bf", "type": "github" }, "original": { @@ -45,11 +46,11 @@ ] }, "locked": { - "lastModified": 1706145859, - "narHash": "sha256-+iGHKwzKVW6aGAWfUmUSJW1KiE6WLYhKyTyWZMTw/cg=", + "lastModified": 1706491084, + "narHash": "sha256-eaEv+orTmr2arXpoE4aFZQMVPOYXCBEbLgK22kOtkhs=", "owner": "nix-community", "repo": "disko", - "rev": "5a2dc95464080764b9ca1b82b5d6d981157522be", + "rev": "f67ba6552845ea5d7f596a24d57c33a8a9dc8de9", "type": "github" }, "original": { @@ -69,7 +70,6 @@ ] }, "locked": { - "lastModified": 1701334333, "lastModified": 1706170797, "narHash": "sha256-rsJ11xznoc2JSmM57bstxyas8xq8ZaEqNhQuQWyoQ/A=", "owner": "nix-community", @@ -363,20 +363,41 @@ ] }, "locked": { - "lastModified": 1705659542, - "narHash": "sha256-WA3xVfAk1AYmFdwghT7mt/erYpsU6JPu9mdTEP/e9HQ=", + "lastModified": 1706798041, + "narHash": "sha256-BbvuF4CsVRBGRP8P+R+JUilojk0M60D7hzqE0bEvJBQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "10cd9c53115061aa6a0a90aad0b0dde6a999cdb9", + "rev": "4d53427bce7bf3d17e699252fd84dc7468afc46e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", "repo": "home-manager", "type": "github" } }, + "jovian": { + "inputs": { + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "chaotic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706509827, + "narHash": "sha256-fnZ8BXDgfvXGwStQvmpUXe+I+Fjd2JCLm8xo0kVwVKc=", + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "rev": "e2c026d8efea340d2a2dcc56775212979dd51ef2", + "type": "github" + }, + "original": { + "owner": "Jovian-Experiments", + "repo": "Jovian-NixOS", + "type": "github" + } + }, "nix-alien": { "inputs": { "flake-compat": "flake-compat", @@ -390,11 +411,11 @@ ] }, "locked": { - "lastModified": 1705306460, - "narHash": "sha256-tV42EZ0GAYDKUu8IUaeZgSsOBtp/1IO9jEkHpOj5K94=", + "lastModified": 1706619215, + "narHash": "sha256-BuZZ2dWa4UloNpF0dsMYZUBkfFvGlH4u2y/Rc1PbfUk=", "owner": "thiagokokada", "repo": "nix-alien", - "rev": "f43ce845467ad2b90df34323dbed3de9f17471d7", + "rev": "4830d795e5fab4dc601d3600073135ff9c87ba03", "type": "github" }, "original": { @@ -418,6 +439,29 @@ "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "chaotic", + "jovian", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1690328911, + "narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=", + "owner": "zhaofengli", + "repo": "nix-github-actions", + "rev": "96df4a39c52f53cb7098b923224d8ce941b64747", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "ref": "matrix-name", + "repo": "nix-github-actions", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": "nixpkgs_2" @@ -443,11 +487,11 @@ ] }, "locked": { - "lastModified": 1705806513, - "narHash": "sha256-FcOmNjhHFfPz2udZbRpZ1sfyhVMr+C2O8kOxPj+HDDk=", + "lastModified": 1706411424, + "narHash": "sha256-BzziJYucEZvdCE985vjPoo3ztWcmUiSQ1wJ2CoT6jCc=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "f8e04fbcebcc24cebc91989981bd45f69b963ed7", + "rev": "c782f2a4f6fc94311ab5ef31df2f1149a1856181", "type": "github" }, "original": { @@ -516,30 +560,14 @@ "url": "https://git.vlt81.de/tristan/nixinate.git" } }, - "nixos-unstable": { - "locked": { - "lastModified": 1704722960, - "narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1705856552, - "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", - "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", - "revCount": 574351, + "lastModified": 1706550542, + "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "revCount": 577948, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.574351%2Brev-612f97239e2cc474c13c9dafa0df378058c5ad8d/018d3085-aff0-7a0b-ab80-1a9c414de8cd/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.577948%2Brev-97b17f32362e475016f942bbdfda4a4a72a8a652/018d5e85-4e02-7200-b411-d764d60cd44e/source.tar.gz" }, "original": { "type": "tarball", @@ -582,11 +610,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1704842529, - "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", + "lastModified": 1706683685, + "narHash": "sha256-FtPPshEpxH/ewBOsdKBNhlsL2MLEFv1hEnQ19f/bFsQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", + "rev": "5ad9903c16126a7d949101687af0aa589b1d7d3d", "type": "github" }, "original": { @@ -646,16 +674,16 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1705774713, - "narHash": "sha256-j6ADaDH9XiumUzkTPlFyCBcoWYhO83lfgiSqEJF2zcs=", + "lastModified": 1706550542, + "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1b64fc1287991a9cce717a01c1973ef86cb1af0b", + "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -715,11 +743,11 @@ }, "nur": { "locked": { - "lastModified": 1706174248, - "narHash": "sha256-VNN7md+kJhBvl5bINEXybSG4jHavrQIlXdywpcaEEwc=", + "lastModified": 1706867093, + "narHash": "sha256-AjZ17vssveafF7hflOl3Hp8EeZ89frQrP/R37AeLta0=", "owner": "nix-community", "repo": "NUR", - "rev": "20f64c7125413fc19372f11b45db99363bea7c1f", + "rev": "b059a4cc6638f3be13c710dbbf1ee537eeb37359", "type": "github" }, "original": { @@ -754,11 +782,11 @@ ] }, "locked": { - "lastModified": 1705946102, - "narHash": "sha256-0hy28d7qC7Hv6/KV7xefa03b2xFJIGHPYAPcsVwzTeM=", + "lastModified": 1706718414, + "narHash": "sha256-qOwU5X0nG4nJ3xBSKWfJ9ROf6T2r7jThO85AiBimwgc=", "owner": "pjones", "repo": "plasma-manager", - "rev": "4d209a083aeefa7d4f8060de14896399bbc8f30b", + "rev": "91b5335d4310e94527a8a778d5e8884c43340276", "type": "github" }, "original": { @@ -807,7 +835,6 @@ "nix-ld-rs": "nix-ld-rs", "nix-wallpaper": "nix-wallpaper", "nixinate": "nixinate", - "nixos-unstable": "nixos-unstable", "nixpkgs": "nixpkgs_5", "nixpkgs-unstable": "nixpkgs-unstable", "nixtheplanet": "nixtheplanet", diff --git a/flake.nix b/flake.nix index 466bb25..bf75175 100644 --- a/flake.nix +++ b/flake.nix @@ -7,18 +7,15 @@ nixpkgs-unstable = { url = "github:NixOS/nixpkgs/nixpkgs-unstable"; }; - nixos-unstable = { - url = "github:NixOS/nixpkgs/nixos-unstable"; - }; nixpkgs = { - url = "github:NixOS/nixpkgs/nixos-23.11"; + url = "github:NixOS/nixpkgs/nixos-unstable"; }; nixinate.url = "git+https://git.vlt81.de/tristan/nixinate.git"; chaotic = { url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; }; home-manager = { - url = "github:nix-community/home-manager/release-23.11"; + url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; emacs-overlay = { @@ -60,7 +57,6 @@ { self , nixpkgs , nixpkgs-unstable - , nixos-unstable , nixtheplanet , nixinate , home-manager @@ -75,12 +71,10 @@ } @ inputs: let system = "x86_64-linux"; - unstable-os = import nixos-unstable pkgs-args; unstable-pkgs = import nixpkgs-unstable pkgs-args; my-overlay = final: prev: { my = self.packages."${system}"; unstable-pkgs = unstable-pkgs.pkgs; - unstable-os = unstable-os.pkgs; }; overlays = [ my-overlay diff --git a/home-mods/audio/default.nix b/home-mods/audio/default.nix index fb82e96..8710cc2 100644 --- a/home-mods/audio/default.nix +++ b/home-mods/audio/default.nix @@ -7,10 +7,10 @@ services.easyeffects = { enable = true; # preset = "default"; - package = pkgs.unstable-os.easyeffects; + package = pkgs.easyeffects; }; - home.packages = with pkgs.unstable-os; [ + home.packages = with pkgs; [ my.spotube spotify ncspot diff --git a/home-mods/desktop/default.nix b/home-mods/desktop/default.nix index 1e81865..4437a7d 100644 --- a/home-mods/desktop/default.nix +++ b/home-mods/desktop/default.nix @@ -13,7 +13,7 @@ in { programs.mpv = { enable = true; - package = pkgs.unstable-os.mpv; + package = pkgs.mpv; }; home = { @@ -21,31 +21,31 @@ in packages = with pkgs; [ bitwarden - unstable-os.airshipper - unstable-os.ardour + airshipper + ardour # blender - unstable-os.brave - unstable-os.cavalier - unstable-os.freetube - unstable-os.filelight - unstable-os.element-desktop - unstable-os.inkscape - unstable-os.jellyfin-media-player - # unstable-os.miraclecast - unstable-os.kate - unstable-os.kdenlive - unstable-os.krita - unstable-os.libsForQt5.kdeconnect-kde - unstable-os.libsForQt5.plasma-vault - unstable-os.libsForQt5.plasma-browser-integration - unstable-os.nextcloud-client - unstable-os.onlyoffice-bin - unstable-os.protonup-qt - unstable-os.rustdesk - unstable-os.signal-desktop - unstable-os.tutanota-desktop - unstable-os.thunderbird - unstable-os.webcord-vencord + brave + cavalier + freetube + filelight + element-desktop + inkscape + jellyfin-media-player + # miraclecast + kate + kdenlive + krita + libsForQt5.kdeconnect-kde + libsForQt5.plasma-vault + libsForQt5.plasma-browser-integration + nextcloud-client + onlyoffice-bin + protonup-qt + rustdesk + signal-desktop + tutanota-desktop + thunderbird + webcord-vencord ]; }; } diff --git a/home-mods/firefox/default.nix b/home-mods/firefox/default.nix index 410b590..63a0c8e 100644 --- a/home-mods/firefox/default.nix +++ b/home-mods/firefox/default.nix @@ -5,7 +5,7 @@ }: { programs.firefox = { enable = true; - package = pkgs.unstable-os.firefox; + package = pkgs.firefox; profiles = { default = { diff --git a/os-mods/amdgpu/default.nix b/os-mods/amdgpu/default.nix index 16e150f..084dd5f 100644 --- a/os-mods/amdgpu/default.nix +++ b/os-mods/amdgpu/default.nix @@ -18,12 +18,12 @@ services.xserver.videoDrivers = lib.mkDefault [ "modesetting" ]; systemd.tmpfiles.rules = [ - "L+ /opt/rocm/hip - - - - ${pkgs.unstable-os.rocmPackages.clr}" + "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" ]; hardware.opengl = { driSupport = true; driSupport32Bit = true; - extraPackages = with pkgs.unstable-os; [ + extraPackages = with pkgs; [ amdvlk rocmPackages.rocm-runtime rocm-opencl-icd @@ -35,7 +35,7 @@ gst_all_1.gstreamer gst_all_1.gst-vaapi ]; - extraPackages32 = with pkgs.unstable-os; [ + extraPackages32 = with pkgs; [ driversi686Linux.amdvlk driversi686Linux.vaapiVdpau driversi686Linux.libvdpau-va-gl @@ -44,7 +44,7 @@ # Force radv environment.variables.AMD_VULKAN_ICD = "RADV"; - environment.systemPackages = with pkgs.unstable-os; [ + environment.systemPackages = with pkgs; [ vulkan-tools libva-utils # nixgl.nixGLIntel diff --git a/os-mods/common/default.nix b/os-mods/common/default.nix index 8087a8c..5629914 100644 --- a/os-mods/common/default.nix +++ b/os-mods/common/default.nix @@ -162,7 +162,7 @@ gvfs.enable = true; avahi.enable = true; - avahi.nssmdns = true; + avahi.nssmdns4 = true; }; networking.firewall = { diff --git a/os-mods/desktop/gaming.nix b/os-mods/desktop/gaming.nix index 49253c4..0a0446c 100644 --- a/os-mods/desktop/gaming.nix +++ b/os-mods/desktop/gaming.nix @@ -5,9 +5,9 @@ }: { programs.steam = { enable = true; - package = pkgs.unstable-os.steam.override { + package = pkgs.steam.override { extraPkgs = pkgs: - with pkgs.unstable-os; [ + with pkgs; [ xorg.libXcursor xorg.libXi xorg.libXinerama @@ -30,7 +30,7 @@ proton-ge-custom ]; - environment.systemPackages = with pkgs.unstable-os; [ + environment.systemPackages = with pkgs; [ gamescope ]; } diff --git a/os-mods/network/default.nix b/os-mods/network/default.nix index 5154324..34d6068 100644 --- a/os-mods/network/default.nix +++ b/os-mods/network/default.nix @@ -66,7 +66,7 @@ netclient = { enable = true; - package = pkgs.unstable-os.netclient; + package = pkgs.netclient; }; tailscale = { diff --git a/os-mods/ryzenapu/default.nix b/os-mods/ryzenapu/default.nix index ec2a258..8832390 100644 --- a/os-mods/ryzenapu/default.nix +++ b/os-mods/ryzenapu/default.nix @@ -8,7 +8,7 @@ # This automatically sets the ryzen apu TDP to 45 W on AC and 10W on battery # addionally it enables and configures some general power management stuff like powertop - environment.systemPackages = with pkgs.unstable-os; [ + environment.systemPackages = with pkgs; [ ryzenadj (writers.writeDashBin "set_tdp" '' set -efux @@ -26,7 +26,7 @@ unitConfig = { RefuseManualStart = true; }; - path = with pkgs.unstable-os; [ + path = with pkgs; [ coreutils ryzenadj ]; @@ -41,7 +41,7 @@ description = "Change TDP to power saving TDP when on battery power"; wantedBy = [ "battery.target" ]; unitConfig = { RefuseManualStart = true; }; - path = with pkgs.unstable-os; [ + path = with pkgs; [ coreutils ryzenadj ]; diff --git a/os-mods/virt/default.nix b/os-mods/virt/default.nix index 038ae32..55f9c8d 100644 --- a/os-mods/virt/default.nix +++ b/os-mods/virt/default.nix @@ -3,7 +3,7 @@ , pkgs , ... }: { - environment.systemPackages = with pkgs.unstable-os; [ + environment.systemPackages = with pkgs; [ virtiofsd virt-manager virt-viewer @@ -13,7 +13,7 @@ virtualisation.docker = { enable = true; - package = pkgs.unstable-os.docker; + package = pkgs.docker; storageDriver = lib.mkDefault "overlay2"; liveRestore = false; @@ -22,7 +22,7 @@ virtualisation.libvirtd = { enable = true; - package = pkgs.unstable-os.libvirt; + package = pkgs.libvirt; onShutdown = "suspend"; onBoot = "ignore"; diff --git a/os-mods/xmr/default.nix b/os-mods/xmr/default.nix index d06b429..802964d 100644 --- a/os-mods/xmr/default.nix +++ b/os-mods/xmr/default.nix @@ -10,7 +10,7 @@ dataDir = "/media/SanDisk/monero"; # TODO make config option for this and set sensible default limits.upload = 1024; }; - environment.systemPackages = with pkgs.unstable-os; [ + environment.systemPackages = with pkgs; [ monero-gui monero-cli xmrig diff --git a/systems/nixos-karl-kvm-guest/default.nix b/systems/nixos-karl-kvm-guest/default.nix index 94b7c50..9c269f9 100644 --- a/systems/nixos-karl-kvm-guest/default.nix +++ b/systems/nixos-karl-kvm-guest/default.nix @@ -96,7 +96,7 @@ # Virtualization virtualisation.docker = { enable = true; - package = pkgs.unstable-os.docker; + package = pkgs.docker; # rootless = { # enable = true; # setSocketVariable = true; diff --git a/systems/nixos-pulse/default.nix b/systems/nixos-pulse/default.nix index 2382648..da03759 100644 --- a/systems/nixos-pulse/default.nix +++ b/systems/nixos-pulse/default.nix @@ -75,6 +75,7 @@ 192.168.0.190 vpn.oekonzept.de 192.168.0.180 vewasmb.oekonzept.de 192.168.0.91 puppet.oekonzept.de + 192.168.0.245 camt.oekonzept.net 192.168.0.245 cloud.oekonzept.net 192.168.0.245 office.oekonzept.net 192.168.0.245 llama.oekonzept.net @@ -158,7 +159,7 @@ SUBSYSTEM=="pci", ATTR{power/control}="auto" ''; - environment.systemPackages = with pkgs.unstable-os; [ + environment.systemPackages = with pkgs; [ android-tools android-udev-rules ]; diff --git a/users/default.nix b/users/default.nix index 4327b9e..0dcf7c1 100644 --- a/users/default.nix +++ b/users/default.nix @@ -9,15 +9,15 @@ isNormalUser = true; description = "Testa Test"; extraGroups = [ "audio" "corectrl" "docker" "networkmanager" "i2c" "wheel" "libvirtd" "qemu-libvirtd" "input" ]; - shell = pkgs.unstable-os.fish; + shell = pkgs.fish; home = "/home/tester"; hashedPassword = "$6$YJT50/Za3FSFQuNT$0orD1URwoURoRKO9sIAsUiIHxOtEOjmPXn5Mp7vAmIYlgVmI629qS7YPUInmztEtEorRpkSMbV3.fCy9NQhKX."; }; users.users.tristand = { isNormalUser = true; description = "Tristan Druyen"; - extraGroups = [ "audio" "corectrl" "docker" "networkmanager" "i2c" "wheel" "libvirtd" "qemu-libvirtd" "input" ]; - shell = pkgs.unstable-os.fish; + extraGroups = [ "audio" "corectrl" "dialout" "docker" "networkmanager" "i2c" "wheel" "libvirtd" "qemu-libvirtd" "input" ]; + shell = pkgs.fish; home = "/home/tristand"; hashedPassword = "$6$Wj.XY8JgH5EWuog4$HnbtPJXDEqKXFrzkPVEjih3PytcpBCrkfL7TAwkXd0IFced7kGMlZNliNsAqQ3XqfyUzAYiiKTIqoPVJEk.s.."; };