From bc73e4b350eab8a3e63814c7463de96e6ba6211f Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Sun, 5 Jan 2025 21:04:10 -0600 Subject: [PATCH 1/4] add pv --- home/modules/baseline.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/home/modules/baseline.nix b/home/modules/baseline.nix index c5cdd05..f1f24f2 100644 --- a/home/modules/baseline.nix +++ b/home/modules/baseline.nix @@ -24,6 +24,7 @@ in { killall man-pages man-pages-posix + pv tree units unzip From 3e0e6e4d5dbf03f221bb78a2283925839922d819 Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Sun, 5 Jan 2025 22:23:56 -0600 Subject: [PATCH 2/4] add xdg config --- home/modules/baseline.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/home/modules/baseline.nix b/home/modules/baseline.nix index f1f24f2..0b313f0 100644 --- a/home/modules/baseline.nix +++ b/home/modules/baseline.nix @@ -11,7 +11,17 @@ in { enable = mkEnableOption "Basic home settings"; }; config = mkIf cfg.enable { - xdg.enable = true; + xdg = { + enable = true; + mimeApps = { + enable = true; + defaultApplications = {}; + }; + portal = { + enable = true; + xdgOpenUsePortal = true; + }; + }; home = { stateVersion = "24.05"; # DO NOT CHANGE From 97056c6bfc575894496788869ff2e027c512c8fb Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Sun, 5 Jan 2025 22:24:37 -0600 Subject: [PATCH 3/4] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'nixpkgs': 'github:nixos/nixpkgs/d29ab98cd4a70a387b8ceea3e930b3340d41ac5a?narHash=sha256-vk0xwGZSlvZ/596yxOtsk4gxsIx2VemzdjiU8zhjgWw%3D' (2025-01-03) → 'github:nixos/nixpkgs/cbd8ec4de4469333c82ff40d057350c30e9f7d36?narHash=sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60%3D' (2025-01-05) • Updated input 'nur': 'github:nix-community/NUR/c069281f9ef15582d5c1c59995e9d6cf2c0ed1b6?narHash=sha256-E2pP/HI/adDIzDhYR25xlTQpvMnssZPhozHbTg66H/E%3D' (2025-01-05) → 'github:nix-community/NUR/c03408924cf08dea2eb171942d6b3e463b2741dc?narHash=sha256-pVNRdhEA32ZyiernLrsvpzxxCw2zV7lbw5lzYhHcPU8%3D' (2025-01-06) --- flake.lock | 12 ++++++------ home/modules/baseline.nix | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index f2cfffb..d20a356 100644 --- a/flake.lock +++ b/flake.lock @@ -1030,11 +1030,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1735922141, - "narHash": "sha256-vk0xwGZSlvZ/596yxOtsk4gxsIx2VemzdjiU8zhjgWw=", + "lastModified": 1736061677, + "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d29ab98cd4a70a387b8ceea3e930b3340d41ac5a", + "rev": "cbd8ec4de4469333c82ff40d057350c30e9f7d36", "type": "github" }, "original": { @@ -1067,11 +1067,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1736062223, - "narHash": "sha256-E2pP/HI/adDIzDhYR25xlTQpvMnssZPhozHbTg66H/E=", + "lastModified": 1736136610, + "narHash": "sha256-pVNRdhEA32ZyiernLrsvpzxxCw2zV7lbw5lzYhHcPU8=", "owner": "nix-community", "repo": "NUR", - "rev": "c069281f9ef15582d5c1c59995e9d6cf2c0ed1b6", + "rev": "c03408924cf08dea2eb171942d6b3e463b2741dc", "type": "github" }, "original": { diff --git a/home/modules/baseline.nix b/home/modules/baseline.nix index 0b313f0..46f7432 100644 --- a/home/modules/baseline.nix +++ b/home/modules/baseline.nix @@ -18,8 +18,10 @@ in { defaultApplications = {}; }; portal = { + # this shouldnt be on baseline, as servers have no GUI enable = true; xdgOpenUsePortal = true; + configPackages = with pkgs; [xdg-desktop-portal-gtk]; }; }; From 2e0c03a5ec815024c3d604991d088d2fa65f948f Mon Sep 17 00:00:00 2001 From: Fabian Montero Date: Sun, 5 Jan 2025 23:31:19 -0600 Subject: [PATCH 4/4] fix qt, gtk and darkmode settings --- home/modules/gui/default.nix | 9 ++++----- home/modules/gui/gtk.nix | 11 ----------- 2 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 home/modules/gui/gtk.nix diff --git a/home/modules/gui/default.nix b/home/modules/gui/default.nix index 1e8196e..54bf1bb 100644 --- a/home/modules/gui/default.nix +++ b/home/modules/gui/default.nix @@ -139,11 +139,10 @@ in { }; }; - qt = { - enable = true; - style.name = "bb10dark"; - platformTheme.name = "gtk"; - }; + #qt = { mentioning qt makes qt applications not work, I should probably check how to fix this + # enable = true; + # style.name = "bb10dark"; + #}; home.sessionVariables = { # Use gtk in jvm apps diff --git a/home/modules/gui/gtk.nix b/home/modules/gui/gtk.nix deleted file mode 100644 index fdd2712..0000000 --- a/home/modules/gui/gtk.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: { - home.packages = with pkgs; [ - gruvbox-dark-icons-gtk - libsForQt5.breeze-gtk - ]; -}