This commit is contained in:
Daniel Olsen
2025-06-09 02:05:16 +02:00
parent 0d35606184
commit fa0dc92c7b
5 changed files with 48 additions and 46 deletions

50
flake.lock generated
View File

@@ -242,16 +242,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747688870, "lastModified": 1748665073,
"narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", "narHash": "sha256-RMhjnPKWtCoIIHiuR9QKD7xfsKb3agxzMfJY8V9MOew=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "d5f1f641b289553927b3801580598d200a501863", "rev": "282e1e029cb6ab4811114fc85110613d72771dea",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.11", "ref": "release-25.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -421,11 +421,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1747723695, "lastModified": 1748942041,
"narHash": "sha256-lSXzv33yv1O9r9Ai1MtYFDX3OKhWsZMn/5FFb4Rni/k=", "narHash": "sha256-HEu2gTct7nY0tAPRgBtqYepallryBKR1U8B4v2zEEqA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "6ac6ec6fcb410e15a60ef5ec94b8a2b35b5dd282", "rev": "fc7c4714125cfaa19b048e8aaf86b9c53e04d853",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -453,16 +453,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1747676747, "lastModified": 1748889542,
"narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=", "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "72841a4a8761d1aed92ef6169a636872c986c76d", "rev": "10d7f8d34e5eb9c0f9a0485186c1ca691d2c5922",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-24.11", "ref": "nixos-25.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -531,11 +531,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1747744144, "lastModified": 1748693115,
"narHash": "sha256-W7lqHp0qZiENCDwUZ5EX/lNhxjMdNapFnbErcbnP11Q=", "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2795c506fe8fb7b03c36ccb51f75b6df0ab2553f", "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -547,10 +547,12 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 0, "lastModified": 1748856973,
"narHash": "sha256-LXkWBVqilgx7Pohwqu/ABxDVw+Cmi5/Mj2S2mpUH0Fw=", "narHash": "sha256-RlTsJUvvr8ErjPBsiwrGbbHYW8XbB/oek0Gi78XdWKg=",
"path": "/nix/store/26bdz0j1ggjs92583picsid4rh0qc6sq-source", "owner": "NixOS",
"type": "path" "repo": "nixpkgs",
"rev": "e4b09e47ace7d87de083786b404bf232eb6c89d8",
"type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
@@ -564,11 +566,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1747856695, "lastModified": 1748954271,
"narHash": "sha256-b/wxeIl00EyMKX/ymycy1ntxI79hhZODR7d8wzEVPAA=", "narHash": "sha256-tpA8Nlj5cMqMIVAQDE/9CmA45thnFOSZseTBVtBwWlU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "fc5c6285ef1afc79ed18c14960af4a6a427733b0", "rev": "0f3c9ccce1d63b0fd1d60ce41d9714932760f3a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -691,11 +693,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1747790854, "lastModified": 1748856973,
"narHash": "sha256-8TpwOtr0T016HNlVuDcDNq4q+GMKfLStOSwdabrz+rk=", "narHash": "sha256-RlTsJUvvr8ErjPBsiwrGbbHYW8XbB/oek0Gi78XdWKg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f0d925b947cca0bbe7f2d25115cbaf021844aba7", "rev": "e4b09e47ace7d87de083786b404bf232eb6c89d8",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -2,9 +2,9 @@
description = "dandellion's home-manager profiles"; description = "dandellion's home-manager profiles";
inputs = { 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"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";

View File

@@ -92,13 +92,13 @@ in
sxiv sxiv
eog eog
dolphin kdePackages.dolphin
plasma5Packages.dolphin-plugins plasma5Packages.dolphin-plugins
ffmpegthumbs kdePackages.ffmpegthumbs
plasma5Packages.kdegraphics-thumbnailers plasma5Packages.kdegraphics-thumbnailers
plasma5Packages.kio plasma5Packages.kio
plasma5Packages.kio-extras 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 gedit
@@ -111,7 +111,7 @@ in
libreoffice libreoffice
thunderbird thunderbird
kdenlive kdePackages.kdenlive
frei0r frei0r
audacity audacity
# inkscape # inkscape
@@ -336,7 +336,7 @@ in
home.sessionVariables = { home.sessionVariables = {
EDITOR = "hx"; 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"; OLLAMA_HOST="100.64.0.19";
}; };

View File

@@ -147,11 +147,12 @@ in
gtk = { gtk = {
enable = true; enable = true;
theme = { theme = {
package = pkgs.breeze-gtk; # package = pkgs.breeze-gtk;
package = pkgs.kdePackages.breeze-gtk;
name = "Breeze"; name = "Breeze";
}; };
iconTheme = { iconTheme = {
package = pkgs.breeze-icons; package = pkgs.kdePackages.breeze-icons;
name = "breeze"; name = "breeze";
}; };
}; };
@@ -181,8 +182,8 @@ in
pkgs.source-code-pro pkgs.source-code-pro
pkgs.breeze-qt5 pkgs.kdePackages.breeze-gtk
pkgs.breeze-icons pkgs.kdePackages.breeze-icons
]; ];
}; };
} }

View File

@@ -116,12 +116,7 @@
networking.firewall.allowedUDPPorts = [ config.services.murmur.port ]; networking.firewall.allowedUDPPorts = [ config.services.murmur.port ];
security.rtkit.enable = false; # Enable again when mumble is fixed
# Enable CUPS to print documents.
# services.printing.enable = true;
security.rtkit.enable = true;
services.pipewire = { services.pipewire = {
enable = true; enable = true;
alsa.enable = true; alsa.enable = true;
@@ -166,11 +161,18 @@
services.xserver.xkb.layout = "no"; services.xserver.xkb.layout = "no";
# services.xserver.xkbOptions = "eurosign:e"; # 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.displayManager.lightdm.enable = true;
services.xserver.videoDrivers = ["amdgpu"]; services.xserver.videoDrivers = ["amdgpu"];
programs.zsh.enable = true; programs.zsh.enable = true;
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
@@ -180,8 +182,6 @@
# networking.nameservers = lib.mkForce [ "192.168.0.25" ]; # networking.nameservers = lib.mkForce [ "192.168.0.25" ];
# services.ipfs.enable = true; # services.ipfs.enable = true;
# services.ipfs.gatewayAddress = "/ip4/127.0.0.1/tcp/5002"; # 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 # servers. You should change this only after NixOS release notes say you
# should. # should.
system.stateVersion = "24.11"; # Did you read the comment? system.stateVersion = "24.11"; # Did you read the comment?
} }