diff --git a/flake.lock b/flake.lock index 6cf6e3d..488f71c 100644 --- a/flake.lock +++ b/flake.lock @@ -242,16 +242,16 @@ ] }, "locked": { - "lastModified": 1747688870, - "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", + "lastModified": 1748665073, + "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=", "owner": "nix-community", "repo": "home-manager", - "rev": "d5f1f641b289553927b3801580598d200a501863", + "rev": "282e1e029cb6ab4811114fc85110613d72771dea", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } @@ -421,11 +421,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1747723695, - "narHash": "sha256-lSXzv33yv1O9r9Ai1MtYFDX3OKhWsZMn/5FFb4Rni/k=", + "lastModified": 1748942041, + "narHash": "sha256-HEu2gTct7nY0tAPRgBtqYepallryBKR1U8B4v2zEEqA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282", + "rev": "fc7c4714125cfaa19b048e8aaf86b9c53e04d853", "type": "github" }, "original": { @@ -453,16 +453,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1747676747, - "narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=", + "lastModified": 1748889542, + "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "72841a4a8761d1aed92ef6169a636872c986c76d", + "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } @@ -531,11 +531,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1747744144, - "narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -547,10 +547,12 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 0, - "narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=", - "path": "/nix/store/26bdz0j1ggjs92583picsid4rh0qc6sq-source", - "type": "path" + "lastModified": 1748856973, + "narHash": "sha256-RlTsJUvvr8ErjPBsiwrGbbHYW8XbB/oek0Gi78XdWKg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "e4b09e47ace7d87de083786b404bf232eb6c89d8", + "type": "github" }, "original": { "id": "nixpkgs", @@ -564,11 +566,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1747856695, - "narHash": "sha256-b/wxeIl00EyMKX/ymycy1ntxI79hhZODR7d8wzEVPAA=", + "lastModified": 1748954271, + "narHash": "sha256-tpA8Nlj5cMqMIVAQDE/9CmA45thnFOSZseTBVtBwWlU=", "owner": "nix-community", "repo": "NUR", - "rev": "fc5c6285ef1afc79ed18c14960af4a6a427733b0", + "rev": "0f3c9ccce1d63b0fd1d60ce41d9714932760f3a8", "type": "github" }, "original": { @@ -691,11 +693,11 @@ }, "unstable": { "locked": { - "lastModified": 1747790854, - "narHash": "sha256-8TpwOtr0T016HNlVuDcDNq4q+GMKfLStOSwdabrz+rk=", + "lastModified": 1748856973, + "narHash": "sha256-RlTsJUvvr8ErjPBsiwrGbbHYW8XbB/oek0Gi78XdWKg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f0d925b947cca0bbe7f2d25115cbaf021844aba7", + "rev": "e4b09e47ace7d87de083786b404bf232eb6c89d8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index d090485..1a145fa 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,9 @@ description = "dandellion's home-manager profiles"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; - home-manager.url = "github:nix-community/home-manager/release-24.11"; + home-manager.url = "github:nix-community/home-manager/release-25.05"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; diff --git a/home/profiles/base/default.nix b/home/profiles/base/default.nix index cd0a0e0..351f62a 100644 --- a/home/profiles/base/default.nix +++ b/home/profiles/base/default.nix @@ -92,13 +92,13 @@ in sxiv eog - dolphin + kdePackages.dolphin plasma5Packages.dolphin-plugins - ffmpegthumbs + kdePackages.ffmpegthumbs plasma5Packages.kdegraphics-thumbnailers plasma5Packages.kio plasma5Packages.kio-extras - konsole # https://bugs.kde.org/show_bug.cgi?id=407990 reeee + kdePackages.konsole # https://bugs.kde.org/show_bug.cgi?id=407990 reeee gedit @@ -111,7 +111,7 @@ in libreoffice thunderbird - kdenlive + kdePackages.kdenlive frei0r audacity # inkscape @@ -336,7 +336,7 @@ in home.sessionVariables = { EDITOR = "hx"; - GRZEGORZ_DEFAULT_API_BASE = "https://georg.pvv.ntnu.no/api"; + GRZEGORZ_DEFAULT_API_BASE = "https://georg-backend.pvv.ntnu.no/api"; OLLAMA_HOST="100.64.0.19"; }; diff --git a/home/profiles/xsession/default.nix b/home/profiles/xsession/default.nix index 92da418..0a05527 100644 --- a/home/profiles/xsession/default.nix +++ b/home/profiles/xsession/default.nix @@ -147,11 +147,12 @@ in gtk = { enable = true; theme = { - package = pkgs.breeze-gtk; + # package = pkgs.breeze-gtk; + package = pkgs.kdePackages.breeze-gtk; name = "Breeze"; }; iconTheme = { - package = pkgs.breeze-icons; + package = pkgs.kdePackages.breeze-icons; name = "breeze"; }; }; @@ -181,8 +182,8 @@ in pkgs.source-code-pro - pkgs.breeze-qt5 - pkgs.breeze-icons + pkgs.kdePackages.breeze-gtk + pkgs.kdePackages.breeze-icons ]; }; } diff --git a/hosts/asuka/soryu/configuration.nix b/hosts/asuka/soryu/configuration.nix index 5fd8ef4..9e916e2 100644 --- a/hosts/asuka/soryu/configuration.nix +++ b/hosts/asuka/soryu/configuration.nix @@ -116,12 +116,7 @@ networking.firewall.allowedUDPPorts = [ config.services.murmur.port ]; - - # Enable CUPS to print documents. - # services.printing.enable = true; - - - security.rtkit.enable = true; + security.rtkit.enable = false; # Enable again when mumble is fixed services.pipewire = { enable = true; alsa.enable = true; @@ -166,11 +161,18 @@ services.xserver.xkb.layout = "no"; # services.xserver.xkbOptions = "eurosign:e"; + i18n = { + defaultLocale = "nb_NO.UTF-8"; + extraLocales = [ "en_US.UTF-8/UTF-8" "nn_NO.UTF-8/UTF-8" ]; + extraLocaleSettings = { + LC_COLLATE = "nb_NO.UTF-8"; + LC_MESSAGES = "en_US.UTF-8"; + }; + }; + services.xserver.displayManager.lightdm.enable = true; services.xserver.videoDrivers = ["amdgpu"]; - - programs.zsh.enable = true; virtualisation.docker.enable = true; @@ -180,8 +182,6 @@ # networking.nameservers = lib.mkForce [ "192.168.0.25" ]; - - # services.ipfs.enable = true; # services.ipfs.gatewayAddress = "/ip4/127.0.0.1/tcp/5002"; @@ -206,5 +206,4 @@ # servers. You should change this only after NixOS release notes say you # should. system.stateVersion = "24.11"; # Did you read the comment? - }