diff --git a/flake.lock b/flake.lock index 57ceb11..1ed4288 100644 --- a/flake.lock +++ b/flake.lock @@ -25,39 +25,6 @@ "type": "github" } }, - "aquamarine": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1730968822, - "narHash": "sha256-NocDjINsh6ismkhb0Xr6xPRksmhuB2WGf8ZmXMhxu7Y=", - "owner": "hyprwm", - "repo": "aquamarine", - "rev": "a49bc3583ff223f426cb3526fdaa4bcaa247ec14", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "aquamarine", - "type": "github" - } - }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -204,22 +171,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "flake": false, "locked": { "lastModified": 1717312683, @@ -235,7 +186,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1696426674, @@ -251,7 +202,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_3": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -265,7 +216,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_5": { + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1673956053, @@ -322,7 +273,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1726560853, @@ -340,7 +291,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1726560853, @@ -399,7 +350,7 @@ "nixvim", "flake-compat" ], - "gitignore": "gitignore_2", + "gitignore": "gitignore", "nixpkgs": [ "nixvim", "nixpkgs" @@ -424,28 +375,6 @@ } }, "gitignore": { - "inputs": { - "nixpkgs": [ - "hyprland", - "pre-commit-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, - "gitignore_2": { "inputs": { "nixpkgs": [ "nixvim", @@ -526,170 +455,6 @@ "type": "github" } }, - "hyprcursor": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728669738, - "narHash": "sha256-EDNAU9AYcx8OupUzbTbWE1d3HYdeG0wO6Msg3iL1muk=", - "owner": "hyprwm", - "repo": "hyprcursor", - "rev": "0264e698149fcb857a66a53018157b41f8d97bb0", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprcursor", - "type": "github" - } - }, - "hyprland": { - "inputs": { - "aquamarine": "aquamarine", - "hyprcursor": "hyprcursor", - "hyprland-protocols": "hyprland-protocols", - "hyprlang": "hyprlang", - "hyprutils": "hyprutils", - "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": [ - "nixpkgs-unstable" - ], - "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_3", - "xdph": "xdph" - }, - "locked": { - "lastModified": 1730969692, - "narHash": "sha256-yHY98IWTLDz57TrseUxdh5QnpngcNCjNXTJ2XCeNhtk=", - "ref": "refs/heads/main", - "rev": "e58e97b0a38b8ccc87a4304c9e4e2b37c9966875", - "revCount": 5425, - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland" - }, - "original": { - "submodules": true, - "type": "git", - "url": "https://github.com/hyprwm/Hyprland" - } - }, - "hyprland-protocols": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728345020, - "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", - "owner": "hyprwm", - "repo": "hyprland-protocols", - "rev": "a7c183800e74f337753de186522b9017a07a8cee", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-protocols", - "type": "github" - } - }, - "hyprlang": { - "inputs": { - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1728168612, - "narHash": "sha256-AnB1KfiXINmuiW7BALYrKqcjCnsLZPifhb/7BsfPbns=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "f054f2e44d6a0b74607a6bc0f52dba337a3db38e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprutils": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1730968903, - "narHash": "sha256-zFvzLXcSm0Ia4XI1SE4FQ9KE63hlGrRWhLtwMolWuR8=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "3ce0cde8709cdacbfba471f8e828433b58a561e9", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprwayland-scanner": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1726874836, - "narHash": "sha256-VKR0sf0PSNCB0wPHVKSAn41mCNVCnegWmgkrneKDhHM=", - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "rev": "500c81a9e1a76760371049a8d99e008ea77aa59e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprwayland-scanner", - "type": "github" - } - }, "ixx": { "inputs": { "flake-utils": [ @@ -775,11 +540,11 @@ }, "nixos-cosmic": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "nixpkgs": [ "nixpkgs-unstable" ], - "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs-stable": "nixpkgs-stable", "rust-overlay": "rust-overlay" }, "locked": { @@ -835,7 +600,7 @@ }, "nixos-wsl": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" @@ -902,22 +667,6 @@ "type": "github" } }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1730741070, - "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d063c1dd113c91ab27959ba540c0d9753409edf3", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1732014248, @@ -953,7 +702,7 @@ "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts", "git-hooks": "git-hooks", "home-manager": [ @@ -1016,30 +765,6 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": "flake-compat", - "gitignore": "gitignore", - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1730814269, - "narHash": "sha256-fWPHyhYE6xvMI1eGY3pwBTq85wcy1YXqdzTZF+06nOg=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "d70155fdc00df4628446352fc58adc640cd705c2", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -1047,7 +772,6 @@ "flake-utils": "flake-utils", "home-manager": "home-manager", "home-manager-unstable": "home-manager-unstable", - "hyprland": "hyprland", "nix-colors": "nix-colors", "nixos-cosmic": "nixos-cosmic", "nixos-generators": "nixos-generators", @@ -1087,7 +811,7 @@ "base16-fish": "base16-fish", "base16-helix": "base16-helix", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_4", "gnome-shell": "gnome-shell", "home-manager": [ @@ -1096,7 +820,7 @@ "nixpkgs": [ "nixpkgs-unstable" ], - "systems": "systems_6", + "systems": "systems_5", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux" @@ -1147,16 +871,16 @@ }, "systems_3": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1190,21 +914,6 @@ "type": "github" } }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -1274,47 +983,6 @@ "repo": "treefmt-nix", "type": "github" } - }, - "xdph": { - "inputs": { - "hyprland-protocols": [ - "hyprland", - "hyprland-protocols" - ], - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprutils" - ], - "hyprwayland-scanner": [ - "hyprland", - "hyprwayland-scanner" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1730743262, - "narHash": "sha256-iTLqj3lU8kFehPm5tXpctzkD274t/k1nwSSq3qCWXeg=", - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "rev": "09b23cef06fe248e61cec8862c04b9bcb62f4b6d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "xdg-desktop-portal-hyprland", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index bf2a495..a00b402 100644 --- a/flake.nix +++ b/flake.nix @@ -57,10 +57,10 @@ inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.home-manager.follows = "home-manager-unstable"; }; - hyprland = { - url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; - inputs.nixpkgs.follows = "nixpkgs-unstable"; - }; + #hyprland = { + # url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; + # inputs.nixpkgs.follows = "nixpkgs-unstable"; + #}; }; outputs = { self, nur, nixpkgs, nixos-hardware, nixos-wsl, nixpkgs-unstable , agenix, home-manager, home-manager-unstable, nix-colors, nixos-cosmic diff --git a/modules/graphical/gnome.nix b/modules/graphical/gnome.nix index 387e40b..37d2c77 100644 --- a/modules/graphical/gnome.nix +++ b/modules/graphical/gnome.nix @@ -56,12 +56,10 @@ in { gnomeExtensions.dash2dock-lite gnomeExtensions.dash-to-dock gnomeExtensions.vitals - gnomeExtensions.rounded-window-corners - gnomeExtensions.wallpaper-switcher + gnomeExtensions.rounded-window-corners-reborn gnomeExtensions.backslide gnomeExtensions.tray-icons-reloaded gnomeExtensions.blur-my-shell - gnomeExtensions.material-shell gnomeExtensions.paperwm ]; }; diff --git a/modules/graphical/hyprland.nix b/modules/graphical/hyprland.nix index 5a69476..329f5a7 100644 --- a/modules/graphical/hyprland.nix +++ b/modules/graphical/hyprland.nix @@ -19,12 +19,12 @@ in { }; }; - nix.settings = { - substituters = [ "https://hyprland.cachix.org" ]; - trusted-public-keys = [ - "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" - ]; - }; + #nix.settings = { + # substituters = [ "https://hyprland.cachix.org" ]; + # trusted-public-keys = [ + # "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + # ]; + #}; hardware = { # Opengl diff --git a/modules/misc/cli-tools.nix b/modules/misc/cli-tools.nix index bbeac4e..9a90db4 100644 --- a/modules/misc/cli-tools.nix +++ b/modules/misc/cli-tools.nix @@ -32,7 +32,7 @@ in environment.systemPackages = with pkgs; [ getTotalPowerUsed watchCurrentPowerUsed - powerjoular # monitor power usage + (if lib.versionOlder lib.version "25.05" then wget else powerjoular) # monitor power usage fzf # fuzzy finder bat # fancy cat fd # nicer find diff --git a/modules/services/caldav.nix b/modules/services/caldav.nix index fdc2a4a..75db09f 100644 --- a/modules/services/caldav.nix +++ b/modules/services/caldav.nix @@ -29,7 +29,11 @@ in { }; systemd.services.kop-fhcalendar = let - radicale = config.services.radicale.settings.storage.filesystem_folder; + radicale = if lib.versionOlder lib.version "25.05" then + (builtins.elemAt + config.services.radicale.settings.storage.filesystem_folder 0) + else + config.services.radicale.settings.storage.filesystem_folder; # not reproducible working = "${radicale}/collection-root/kopatz/b6d2c446-8109-714a-397f-1f35d3136639"; diff --git a/overlays.nix b/overlays.nix index 129c101..9297677 100644 --- a/overlays.nix +++ b/overlays.nix @@ -16,17 +16,17 @@ in { #discord = prev.vesktop; tetrio-desktop = prev.tetrio-desktop.override { withTetrioPlus = true; }; nerdfonts = prev.nerdfonts.override { fonts = [ "Hack" "Noto" ]; }; - hyprland = prev.hyprland.overrideAttrs (oldAttrs: { - version = "0.45.0"; + #hyprland = prev.hyprland.overrideAttrs (oldAttrs: { + # version = "0.45.0"; - src = prev.fetchFromGitHub { - owner = "hyprwm"; - repo = "hyprland"; - fetchSubmodules = true; - rev = "refs/tags/v0.45.0"; - hash = "sha256-//Ib7gXCA8jq8c+QGTTIO0oH0rUYYBXGp8sqpI1jlhA="; - }; - }); + # src = prev.fetchFromGitHub { + # owner = "hyprwm"; + # repo = "hyprland"; + # fetchSubmodules = true; + # rev = "refs/tags/v0.45.0"; + # hash = "sha256-//Ib7gXCA8jq8c+QGTTIO0oH0rUYYBXGp8sqpI1jlhA="; + # }; + #}); # mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; #}); diff --git a/systems/vm/configuration.nix b/systems/vm/configuration.nix index 9249e9c..848b162 100644 --- a/systems/vm/configuration.nix +++ b/systems/vm/configuration.nix @@ -2,6 +2,7 @@ imports = [ ./vm-common.nix + (modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/profiles/qemu-guest.nix") #(modulesPath + "/profiles/minimal.nix") ]; diff --git a/systems/vm/vm-common.nix b/systems/vm/vm-common.nix index ec0ad66..999a1ce 100644 --- a/systems/vm/vm-common.nix +++ b/systems/vm/vm-common.nix @@ -14,4 +14,20 @@ graphics = true; # Boot the vm in a window. }; }; + boot = { + kernelParams = [ "console=tty0" "console=ttyS0" ]; + loader.timeout = lib.mkForce 1; + + loader.grub = { + efiSupport = true; + efiInstallAsRemovable = true; + device = "nodev"; + }; + }; + fileSystems = { + "/" = { + device = "/dev/sda1"; + fsType = "ext4"; + }; + }; }