diff --git a/home/colors.nix b/home/colors.nix index bd2eabe..863a3c2 100644 --- a/home/colors.nix +++ b/home/colors.nix @@ -191,7 +191,6 @@ in size = 24; }; - gtk2.extraConfig = '' style "custom-dark" { # Background, foreground, and base colors for different states diff --git a/home/fonts.nix b/home/fonts.nix index 4caa9dc..d17834d 100644 --- a/home/fonts.nix +++ b/home/fonts.nix @@ -1,4 +1,9 @@ -{ pkgs, lib, config, ... }: +{ + pkgs, + lib, + config, + ... +}: { # Enable fontconfig (required for font settings) @@ -6,7 +11,7 @@ # Install fonts home.packages = with pkgs; [ - + # Main fonts notonoto noto-fonts @@ -50,4 +55,3 @@ ]; }; } - diff --git a/home/python.nix b/home/python.nix index 2f3f1c0..47ebac6 100644 --- a/home/python.nix +++ b/home/python.nix @@ -1,4 +1,5 @@ -{pkgs, ...}: { +{ pkgs, ... }: +{ home.packages = [ (pkgs.python312.withPackages (ppkgs: [ ppkgs.uv @@ -22,6 +23,5 @@ ppkgs.ipykernel ])) - ]; } diff --git a/home/sshconfig.nix b/home/sshconfig.nix index 6387a92..10ac0bd 100644 --- a/home/sshconfig.nix +++ b/home/sshconfig.nix @@ -31,8 +31,6 @@ user = "adriangl"; }; - - "*.ntnu.no !login.pvv.ntnu.no" = { user = "adriangl"; proxyJump = "login.pvv.ntnu.no"; @@ -76,7 +74,6 @@ hostname = "bekkalokk.pvv.ntnu.no"; }; - #home "aragon" = { port = 6969; diff --git a/home/xdg.nix b/home/xdg.nix index 56c2b5f..91a6ceb 100644 --- a/home/xdg.nix +++ b/home/xdg.nix @@ -5,7 +5,7 @@ ... }: { - home.packages = with pkgs; [ + home.packages = with pkgs; [ xdg-desktop-portal-gtk xdg-desktop-portal xdg-desktop-portal-wlr @@ -18,8 +18,7 @@ xdg.enable = true; -# home.sessionVariables = { -# }; - + # home.sessionVariables = { + # }; } diff --git a/modules/desktopApplications.nix b/modules/desktopApplications.nix index d238f1f..3dcbc9c 100644 --- a/modules/desktopApplications.nix +++ b/modules/desktopApplications.nix @@ -17,7 +17,7 @@ gparted libreoffice-fresh kdePackages.okular - zed-editor + zed-editor-fhs inkscape krita sweethome3d.application diff --git a/modules/develPackages.nix b/modules/develPackages.nix index fceab32..62aa71f 100644 --- a/modules/develPackages.nix +++ b/modules/develPackages.nix @@ -10,6 +10,7 @@ zip unzip + openssl gdb libgcc gcc @@ -36,6 +37,10 @@ rustfmt treefmt + yarn + nodejs-slim + node2nix + jupyter python312Full python312Packages.uv diff --git a/modules/nix.nix b/modules/nix.nix index c785a2f..4b09720 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -77,19 +77,6 @@ supportedFeatures = [ "cuda" ]; mandatoryFeatures = [ ]; } - { - hostName = "bolle.pbsds.net"; - system = "x86_64-linux"; - maxJobs = 6; - speedFactor = 6000; - } - { - hostName = "garp.pbsds.net"; - system = "x86_64-linux"; - maxJobs = 4; - # i7-6700 - speedFactor = 4000; - } ]; distributedBuilds = true;