diff --git a/configuration.nix b/configuration.nix index 07f1950..efd05dd 100755 --- a/configuration.nix +++ b/configuration.nix @@ -114,7 +114,7 @@ in xwayland.enable = true; }; - system.stateVersion = "23.11"; + system.stateVersion = "24.05"; nix.settings.experimental-features = [ "nix-command" "flakes" ]; diff --git a/flake.lock b/flake.lock index dba001a..90c4c85 100755 --- a/flake.lock +++ b/flake.lock @@ -42,11 +42,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1717128197, - "narHash": "sha256-jUObiEzZXl07D1JYsZr86TJOFFeJw3rJD3OUOCHicP0=", + "lastModified": 1717646600, + "narHash": "sha256-yHNeUEOU8/n+ULrsokW5aCLDWg/mEVbPCOyhTIorZns=", "owner": "rycee", "repo": "nur-expressions", - "rev": "179e0cecb2c8a663fcf9acfaff067cd2dd0da66b", + "rev": "bdbbd8c2cb03b23b586fea14a8a680b218ab363c", "type": "gitlab" }, "original": { @@ -155,16 +155,16 @@ ] }, "locked": { - "lastModified": 1716729592, - "narHash": "sha256-Y3bOjoh2cFBqZN0Jw1zUdyr7tjygyxl2bD/QY73GZP0=", + "lastModified": 1717527182, + "narHash": "sha256-vWSkg6AMok1UUQiSYVdGMOXKD2cDFnajITiSi0Zjd1A=", "owner": "nix-community", "repo": "home-manager", - "rev": "2c78a57c544dd19b07442350727ced097e1aa6e6", + "rev": "845a5c4c073f74105022533907703441e0464bc3", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "home-manager", "type": "github" } @@ -208,11 +208,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1717151932, - "narHash": "sha256-MwAAjC9AXaxxmvTMkgZZvdWaE/d7AfVd0L1NZtciRbY=", + "lastModified": 1717605046, + "narHash": "sha256-1oVVblacE6uQztHTTPG6NoUzj5RErIRbmDoVNWnG6xg=", "ref": "refs/heads/main", - "rev": "df6ebe358b30ee7b49f296e05763e5e4b0edce98", - "revCount": 4751, + "rev": "c95845b1488b4bd63e901cbdc4cb68c27a45971b", + "revCount": 4766, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -384,11 +384,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1716655032, - "narHash": "sha256-kQ25DAiCGigsNR/Quxm3v+JGXAEXZ8I7RAF4U94bGzE=", + "lastModified": 1717265169, + "narHash": "sha256-IITcGd6xpNoyq9SZBigCkv4+qMHSqot0RDPR4xsZ2CA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "59a450646ec8ee0397f5fa54a08573e8240eb91f", + "rev": "3b1b4895b2c5f9f5544d02132896aeb9ceea77bc", "type": "github" }, "original": { @@ -400,11 +400,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1716948383, - "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", "type": "github" }, "original": { @@ -431,16 +431,16 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1716991068, - "narHash": "sha256-Av0UWCCiIGJxsZ6TFc+OiKCJNqwoxMNVYDBChmhjNpo=", + "lastModified": 1717555607, + "narHash": "sha256-WZ1s48OODmRJ3DHC+I/DtM3tDRuRJlNqMvxvAPTD7ec=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25cf937a30bf0801447f6bf544fc7486c6309234", + "rev": "0b8e7a1ae5a94da2e1ee3f3030a32020f6254105", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-23.11", + "ref": "nixos-24.05", "type": "indirect" } }, @@ -520,11 +520,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1716692524, - "narHash": "sha256-sALodaA7Zkp/JD6ehgwc0UCBrSBfB4cX66uFGTsqeFU=", + "lastModified": 1717455931, + "narHash": "sha256-8Q6mKSsto8gaGczXd4G0lvawdAYLa5Dlh3/g4hl5CaM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "962797a8d7f15ed7033031731d0bb77244839960", + "rev": "d4555e80d80d2fa77f0a44201ca299f9602492a0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5d8b116..2943e0a 100755 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,10 @@ description = "Multisystem NixOS Flake of Lennart J. Kurzweg"; inputs = { - nixpkgs.url = "nixpkgs/nixos-23.11"; + nixpkgs.url = "nixpkgs/nixos-24.05"; nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-23.11"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; sops-nix = { @@ -107,7 +107,7 @@ red = "#dd1166"; # "#dd1111" "#00aa00"; yellow = "#dd6611"; # "#dddd11" "#ffff00"; }; - xcolor = with ccolor; { + xcolor = with ccolor; rec { background = black.dark; foreground = white.base; border = cyan.base; @@ -120,6 +120,29 @@ positive = alter "#00dd00"; negative = alter "#dd0000"; }; + # ccolor = builtins.mapAttrs alter-set { + # black = "#112200"; + # white = "#ddffdd"; + # blue = "#779944"; + # cyan = "#11ffcc"; + # green = "#00ff00"; + # magenta = "#449999"; + # red = "#dd2200"; + # yellow = "#ffff11"; + # }; + # xcolor = with ccolor; rec { + # background = black.dark; # black.dark; + # foreground = white.base; # white.base; + # border = accent.base; # cyan.base; + # border2 = yellow.base; # blue.base; + # accent = green; # blue; + # secondary = red; # cyan; + # tertiary = yellow; # magenta; + # special = blue; # yellow; + # weird = magenta; # green; + # positive = alter "#00dd00"; # alter "#00dd00"; + # negative = alter "#dd0000"; # alter "#dd0000"; + # }; in ccolor // xcolor; font = { code = { diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index d35ded3..9b03210 100755 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -19,13 +19,13 @@ let }; north = { main = { - name = "DP-4"; + name = "DP-1"; resolution = "2560x1440"; position = "1920x0"; scale = "1.0"; }; left = { - name = "HDMI-A-2"; + name = "HDMI-A-1"; resolution = "1920x1080"; position = "0x360"; scale = "1.0"; diff --git a/home-modules/yazi.nix b/home-modules/yazi.nix index e4a3f2a..5c3dd30 100755 --- a/home-modules/yazi.nix +++ b/home-modules/yazi.nix @@ -24,47 +24,47 @@ lib.mkIf (user != "tv") show_symlink = true; append_keymap = [ { on = [ "" ]; run = "lazygit"; desc = "Run Lazygit in current directory"; } - { on = [ "" ]; exec = ''shell 'dragon -x -i -T "$1"' --confirm''; } + { on = [ "" ]; run = ''shell 'dragon -x -i -T "$1"' --confirm''; } ]; }; opener = { edit = [ - { exec = ''hx "$@"''; desc = "helix"; block = true;} - { exec = ''codium "$@"''; orphan = true;} - { exec = ''nano "$@"''; desc = "nano"; block = true;} + { run = ''hx "$@"''; desc = "helix"; block = true;} + { run = ''codium "$@"''; orphan = true;} + { run = ''nano "$@"''; desc = "nano"; block = true;} ]; play = [ - { exec = ''mpv "$@"''; } - { exec = ''mediainfo "$1"; echo "Press enter to exit"; read''; block = true; desc = "Show mediainfo";} + { run = ''mpv "$@"''; } + { run = ''mediainfo "$1"; echo "Press enter to exit"; read''; block = true; desc = "Show mediainfo";} ]; archive = [ - { exec = ''unar "$1"''; desc = "Extract here"; } + { run = ''unar "$1"''; desc = "Extract here"; } ]; image = [ - { exec = ''imv "$@"''; desc = "imv";} - { exec = ''gimp "$@"''; desc = "gimp";} - { exec = ''swww img "$@"''; desc = "swww wallpaper";} + { run = ''imv "$@"''; desc = "imv";} + { run = ''gimp "$@"''; desc = "gimp";} + { run = ''swww img "$@"''; desc = "swww wallpaper";} ]; font = [ - { exec = ''fontpreview "$@"''; desc = "fontpreview"; } + { run = ''fontpreview "$@"''; desc = "fontpreview"; } ]; document = [ - { exec = ''zathura "$@"''; desc = "zathura"; } - { exec = ''firefox "$@"''; desc = "firefox"; } + { run = ''zathura "$@"''; desc = "zathura"; } + { run = ''firefox "$@"''; desc = "firefox"; } ]; browser = [ - { exec = ''firefox "$@"''; desc = "firefox"; } + { run = ''firefox "$@"''; desc = "firefox"; } ]; office = [ - { exec = ''libreoffice "$@"''; desc = "libreoffice"; } - { exec = ''libreoffice --view "$@"''; desc = "libreoffice read-only"; } + { run = ''libreoffice "$@"''; desc = "libreoffice"; } + { run = ''libreoffice --view "$@"''; desc = "libreoffice read-only"; } ]; shell = [ - { exec = ''sh -c "$@"''; desc = "sh -c"; } - { exec = ''bash -c "$@"''; desc = "bash -c"; } + { run = ''sh -c "$@"''; desc = "sh -c"; } + { run = ''bash -c "$@"''; desc = "bash -c"; } ]; python = [ - { exec = ''python "$@"''; desc = "python"; } + { run = ''python "$@"''; desc = "python"; } ]; }; open.rules = [ diff --git a/home.nix b/home.nix index 6488743..94224fb 100755 --- a/home.nix +++ b/home.nix @@ -53,7 +53,7 @@ ]; home.username = user; home.homeDirectory = "/home/${user}"; - home.stateVersion = "23.11"; + home.stateVersion = "24.05"; nixpkgs.config = { allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) allowed.unfree-packages; permittedInsecurePackages = allowed.inecure-packages; diff --git a/system-modules/hardware-configuration.nix b/system-modules/hardware-configuration.nix index 72cde60..d278499 100755 --- a/system-modules/hardware-configuration.nix +++ b/system-modules/hardware-configuration.nix @@ -49,7 +49,7 @@ } else {}; hardware.opengl.extraPackages = if host == "NxXPS" then with pkgs; [ - (if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then vaapiIntel else intel-vaapi-driver) + (if (lib.versionOlder (lib.versions.majorMinor lib.version) "24.05") then vaapiIntel else intel-vaapi-driver) libvdpau-va-gl intel-media-driver ] else [];