fish: fix run and shell commands

features-nixos/global/stylix.nix

@@ -2,11 +2,13 @@
   pkgs,
   inputs,
   ...
-}: {
+}:
-  imports = [inputs.stylix.nixosModules.stylix];
+{
+  imports = [ inputs.stylix.nixosModules.stylix ];
 
   stylix.enable = true;
   stylix.base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
+  stylix.targets.gtksourceview.enable = false; # otherwise inkspace is recompiled every time
 
   stylix.fonts = {
     serif = {

flake.lock

@@ -105,11 +105,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1789404474,
+        "lastModified": 1792446739,
-        "narHash": "sha256-UXFQ7tFiwn8sPz0EV4CBB2PCf/ZiGIHWn/6MXk81Lxs=",
+        "narHash": "sha256-eINUtQW48bf9G3EYprthHMll8VDKxaXQP52TZFuwMmE=",
         "owner": "serokell",
         "repo": "deploy-rs",
-        "rev": "e760371d631165e7d8de5b0dcf148e21ec4c16f0",
+        "rev": "1cec0527bd09074bbee6d4461900ce5d58267217",
         "type": "github"
       },
       "original": {
@@ -125,11 +125,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1789770686,
+        "lastModified": 1792526520,
-        "narHash": "sha256-uZkBR7yHdIKUFB5SZdfgh1qkGfI3XmYmI/lTiquxbck=",
+        "narHash": "sha256-3hSJlv8mUVnZPMWK2+CM7a9O+nR6Z4mCh27NfLCmTPc=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "725ea35e410ad83be4931d1bff7e090eacaf3563",
+        "rev": "cedd626e11b635470fa6f9fdb8ad79b0075dd7f9",
         "type": "github"
       },
       "original": {
@@ -215,11 +215,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1782949081,
+        "lastModified": 1788450739,
-        "narHash": "sha256-vp6Y/Grm98ESt6ceOkWiHWyZRDV3J1RID4w+6NWK9yA=",
+        "narHash": "sha256-glZLQlzIn1fXH6PazR2iUmTo7kzzyYSshrWhLS9TqCU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "17c9d6cdfc60c64f4ee8d306f9bc0b4ccb51481e",
+        "rev": "31729ca8cbdb4fa927b34e5f4353e6a83f39e993",
         "type": "github"
       },
       "original": {
@@ -340,11 +340,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1789267039,
+        "lastModified": 1792438572,
-        "narHash": "sha256-LWiBv9yAYFi2LPbUhDGHPGKYskJQjj2fw12OlyO1uQo=",
+        "narHash": "sha256-5mQQOcggBRBXB7NlzUxO0dbvQN4euJOISjNybrtfxPk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ec172013fa62135f58fb58dd17ae9651e8f39727",
+        "rev": "24f8f8e786f87d6a818e1746cb2389bf922afdab",
         "type": "github"
       },
       "original": {
@@ -381,11 +381,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1769548169,
+        "lastModified": 1792739756,
-        "narHash": "sha256-03+JxvzmfwRu+5JafM0DLbxgHttOQZkUtDWBmeUkN8Y=",
+        "narHash": "sha256-s0TeXWG5Ci75Y/Hzon0Z7NrN/fG773Rc54/z6oPFszQ=",
         "owner": "nix-community",
         "repo": "impermanence",
-        "rev": "7b1d382faf603b6d264f58627330f9faa5cba149",
+        "rev": "fa627f4c8b8e92f58f58a73d99ee4e1304e64eb2",
         "type": "github"
       },
       "original": {
@@ -463,11 +463,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1789286446,
+        "lastModified": 1792309949,
-        "narHash": "sha256-xVstyCdg0DpzjyrEacm72VJAIP9DMhfWJdPDzhWxHuo=",
+        "narHash": "sha256-2DAEMk8YkV8OF6N2uw9jQ016cYoNkcgnq50AShwWxNw=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "a74e173407559083a412ea89a1cc58ea389c3b65",
+        "rev": "1b4d1758fa6053c5d6284254a793134fa602fbff",
         "type": "github"
       },
       "original": {
@@ -538,11 +538,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1789752250,
+        "lastModified": 1792697326,
-        "narHash": "sha256-q0J27mJDfd4BM9a7KcMVbcRmqyU+goQwudbMIu66qsg=",
+        "narHash": "sha256-2UBK0jdmPANGaeAIoVOZY+hSPB2Gy13ZuZeSxP3vF8k=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "b2d7d02644f0002535a3bb51a73780945cdc7ba4",
+        "rev": "1b418b8f203e49a92f250f8babdd19af1b6f7a7f",
         "type": "github"
       },
       "original": {
@@ -569,11 +569,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1789684949,
+        "lastModified": 1792502884,
-        "narHash": "sha256-ZKhUe/2IJUq1JhKxKMu8rbkgSGmPP2ZCqlIPn40aGCM=",
+        "narHash": "sha256-IoNisKcGbUjdd45qCqywGMCYmZ5EnkxezvLII0FWwNA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "e554fab72f81915600f3f449b786fd9af40439a5",
+        "rev": "02c087f3fe673c9e317f206a627cb6b910336dbe",
         "type": "github"
       },
       "original": {
@@ -626,11 +626,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1789749394,
+        "lastModified": 1792615934,
-        "narHash": "sha256-cFTsMQz8Hzn8MT49oaeLSHg62tE86NykugCWkeM2ypk=",
+        "narHash": "sha256-MlvRfa1O5Cqc2/a+gG+l9TSuowEoCKCmrJ1d9oAVm0I=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "cf9d2fb3e50fa1cd5114c47505ea9177f7ff5f49",
+        "rev": "da6dc0e7b26060f2f71ce3ef7088fb56ee44fa36",
         "type": "github"
       },
       "original": {
@@ -642,11 +642,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1789114715,
+        "lastModified": 1789749394,
-        "narHash": "sha256-ugpsyk3NM2s87vXfUiIIiibbJ4Pp0JPS5p/3mfs+q+c=",
+        "narHash": "sha256-cFTsMQz8Hzn8MT49oaeLSHg62tE86NykugCWkeM2ypk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "21a67dc470149f337cecafbe965d8d252a390518",
+        "rev": "cf9d2fb3e50fa1cd5114c47505ea9177f7ff5f49",
         "type": "github"
       },
       "original": {
@@ -658,11 +658,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1789149629,
+        "lastModified": 1792094642,
-        "narHash": "sha256-eQUZVehWLDBbpBR2rq6DnuRee1ULT6Y675RhsYDSjYI=",
+        "narHash": "sha256-LPFRbrCWWyNsdQLO3SX1B/5UMkFK0hfe7bZR6lENvpc=",
-        "rev": "eaad089433ca2bb662274377d33df3d0e51ef28b",
+        "rev": "fe13242281a67641c0102cdb1087f0ebe586c7df",
         "type": "tarball",
-        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1072397.eaad089433ca/nixexprs.tar.zst"
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1093333.fe13242281a6/nixexprs.tar.zst"
       },
       "original": {
         "type": "tarball",
@@ -676,11 +676,11 @@
         "systems": "systems_4"
       },
       "locked": {
-        "lastModified": 1789311332,
+        "lastModified": 1789959143,
-        "narHash": "sha256-JNsVNLux4emA7/BeZYzzAKnBaPnkatpaf/Fwf7PQT4E=",
+        "narHash": "sha256-9oBHyJtUyunZL+6v0Ub8Y759cXcejQiTHpXtGcx5RLs=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "0043fc97e267fee06ac0d858399ff6fac4242a92",
+        "rev": "4836e77b1798cd42e2de28593bec4c1788da08f5",
         "type": "github"
       },
       "original": {
@@ -695,11 +695,11 @@
         "nixpkgs": "nixpkgs_7"
       },
       "locked": {
-        "lastModified": 1789735339,
+        "lastModified": 1792724653,
-        "narHash": "sha256-KjnprW4lpS4ISCBnoNxlI9++LACjxlsQV7WWNT4cju8=",
+        "narHash": "sha256-uRWUwtNuhaFESC1wEqA652+9vM/OGumIxgIQuJ24rZI=",
         "owner": "noctalia-dev",
         "repo": "noctalia",
-        "rev": "960d4d46bd3149a556504e7c40ecd87abb251a36",
+        "rev": "6423cc232e5b0900f28852b97f50d2836f4d39b7",
         "type": "github"
       },
       "original": {
@@ -721,11 +721,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1785549842,
+        "lastModified": 1790825059,
-        "narHash": "sha256-DCwBZmGsySF7oKGTRgEv2HvpxVXkHT+38VhTM76k0B4=",
+        "narHash": "sha256-j2gFjwxolKN+h8Vcuftrf+ectFYNHTFvq5GE7PKc3b0=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "a9f987b57594e845e3e5cdd423b9a70846d70308",
+        "rev": "83a68412ac4590a62aeada278e4d07b5e98919b2",
         "type": "github"
       },
       "original": {
@@ -787,11 +787,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1789691124,
+        "lastModified": 1792308394,
-        "narHash": "sha256-k+I+R6uwHX3VcJ7326qLV6vCahZUgsVl+i8sSU/Stxk=",
+        "narHash": "sha256-r4G33ygU307QCwyngAS6E9BMhnCRPyZrL7UxRCMrqo0=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "1e73e8f7176d65e1b55e324de099bbfff4b2c574",
+        "rev": "a1438ca361b05d1e70854d5495abcb34fdf6ff47",
         "type": "github"
       },
       "original": {
@@ -820,11 +820,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1786383226,
+        "lastModified": 1791578552,
-        "narHash": "sha256-SM00z+A0/ruFPGCRdoxDnApVGa3A1iLlhRmMvnGH7tU=",
+        "narHash": "sha256-/odhJRZ0iueFk7Ik25/KTZJlgjtNPdzZPdG7KO2FWhM=",
         "owner": "nix-community",
         "repo": "stylix",
-        "rev": "a01dcef2f28b4106d6b3817ab89280194bf716d3",
+        "rev": "dfb8f93ee16d817811363b26c64d9e59bec03c5b",
         "type": "github"
       },
       "original": {
@@ -973,11 +973,11 @@
     "tinted-schemes": {
       "flake": false,
       "locked": {
-        "lastModified": 1785153830,
+        "lastModified": 1790677839,
-        "narHash": "sha256-fNdfCTeCXU3tZG3TMincd+u68qBHQgCr2Ljr/M1mWP0=",
+        "narHash": "sha256-6pEl9T6fqbEpJafjYgKmJFYXjfNZZGTAvmAjP6fz21M=",
         "owner": "tinted-theming",
         "repo": "schemes",
-        "rev": "9bd28ed313560db3c5b605c63bc4e309e78e3fc8",
+        "rev": "d70255b752ac8328ee3d549c72a1a55ce5fc794f",
         "type": "github"
       },
       "original": {
@@ -989,11 +989,11 @@
     "tinted-tmux": {
       "flake": false,
       "locked": {
-        "lastModified": 1785031658,
+        "lastModified": 1790478201,
-        "narHash": "sha256-mZp9O2LjzdMzlqQF3l3fjqsuPBzXy+1qTfBEUGjTlpk=",
+        "narHash": "sha256-fYRH0To1Lypm4VTjv4GkvxZflB/yQZC3LjF9lGaGUnA=",
         "owner": "tinted-theming",
         "repo": "tinted-tmux",
-        "rev": "5d2c67f61ea7af36f16865ab6d541cdba41dc257",
+        "rev": "45a0a260da407f6f687df6462528361b40b77a5e",
         "type": "github"
       },
       "original": {
@@ -1005,11 +1005,11 @@
     "tinted-zed": {
       "flake": false,
       "locked": {
-        "lastModified": 1785030526,
+        "lastModified": 1790476118,
-        "narHash": "sha256-klZf8UviewRkxuu74Bhbq6tqy7oxebQC7UVRWbbtQxU=",
+        "narHash": "sha256-f+zQM6xdMNE4YhrC+Upt+hEY98LgxONmmE6CERp9e6w=",
         "owner": "tinted-theming",
         "repo": "base16-zed",
-        "rev": "16f5a8adf4a6b1310d0a61ab172de963e8f76a02",
+        "rev": "b6630954d638977559362a4bde07cf75c5bbba43",
         "type": "github"
       },
       "original": {
@@ -1045,11 +1045,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1789740036,
+        "lastModified": 1792508117,
-        "narHash": "sha256-SmSOfYfi/aUKdmYgQWNUqkrDnvuPDBY0WkLSNZnR4Jg=",
+        "narHash": "sha256-hXEAY/8fCD2slip0H7C3F7Thuk4w+5pc37xoTbUT5ew=",
         "owner": "Harry-kp",
         "repo": "vortix",
-        "rev": "bdb704eb02d1e9b8b0c2eb871081632f20e5f2c3",
+        "rev": "b0e445ecf88cea94843a681d12a62ce7502aeeab",
         "type": "github"
       },
       "original": {
@@ -1061,11 +1061,11 @@
     "yazi-flavors": {
       "flake": false,
       "locked": {
-        "lastModified": 1787401728,
+        "lastModified": 1790697555,
-        "narHash": "sha256-NGnfrQdsnQITKCZ0oh6DCxeCR2ozJoPAZetsi3ghHAI=",
+        "narHash": "sha256-E1OUF1+mT0V3crVxkewG2Y7hRu8fO+0oRl6NlINmw+o=",
         "owner": "yazi-rs",
         "repo": "flavors",
-        "rev": "20b47bfd78880c2674899597fd26bc01b21ff48c",
+        "rev": "1183892c904f7f0efdf4473e856ed308b7bea98d",
         "type": "github"
       },
       "original": {

homes/julian/features/emacs/default.nix

@@ -67,7 +67,7 @@ in {
       # neocmakelsp # cmake
 
       emacs-all-the-icons-fonts
-      frajul.typst-languagetool
+      # frajul.typst-languagetool
       ltex-ls-plus
 
       (texlive.combine {

homes/julian/features/fish/default.nix

@@ -67,14 +67,28 @@ with lib; {
         cd $argv
       '';
       run = ''
-        nix run --impure nixpkgs#"$argv[1]" -- $argv[2..-1]
+        set -l channel nixpkgs
+
+        if test "$argv[1]" = -u; or test "$argv[1]" = --unstable
+            set channel github:NixOS/nixpkgs/nixpkgs-unstable
+            set -e argv[1]
+        end
+        nix run --impure $channel#"$argv[1]" -- $argv[2..-1]
       '';
       shell = ''
-        set args
+        set -l channel nixpkgs
-        for arg in $argv
+
-            set args $args nixpkgs#$arg
+        if test "$argv[1]" = -u; or test "$argv[1]" = --unstable
+            set channel github:NixOS/nixpkgs/nixpkgs-unstable
+            set -e argv[1]
         end
-        nix shell --impure $args
+
+        set -l packages
+        for arg in $argv
+            set -a packages $channel#$arg
+        end
+
+        nix shell --impure $packages
       '';
       fish_user_key_bindings = ''
         bind ctrl-space 'zi; commandline -f repaint'

homes/julian/features/hyprland/default.nix

@@ -19,7 +19,7 @@
     ./waypipe.nix
 
     # ./hyprbars.nix
-    # inputs.noctalia.homeModules.default # Use for latest version from inputs
+    inputs.noctalia.homeModules.default # Use for latest version from inputs
   ];
 
   xdg.portal = {
@@ -40,16 +40,15 @@
   };
 
   # noctalia-shell ipc call state all | jq .settings | xclip
-  xdg.configFile."noctalia/settings.json".source = ./noctalia.json;
+  # xdg.configFile."noctalia/settings.json".source = ./noctalia.json;
 
-  # programs.noctalia = {
+  programs.noctalia = {
-  #   enable = true;
+    enable = true;
-  #   # noctalia config export full > noctalia.toml
+    # noctalia config export full > noctalia.toml
-  #   settings = ./noctalia.toml;
+    settings = ./noctalia.toml;
-  # };
+  };
 
   home.packages = with pkgs; [
-    unstable.noctalia-shell # Use for stable version instead of latest from the input
     hyprpicker
     hyprcursor
     brightnessctl
@@ -89,6 +88,7 @@
     MOZ_ENABLE_WAYLAND = 1;
     QT_QPA_PLATFORM = "wayland";
     LIBSEAT_BACKEND = "logind";
+    NIXOS_OZONE_WL = 1;
   };
 
   services.network-manager-applet.enable = true;
@@ -104,8 +104,7 @@
         local terminal = "${config.terminal}"
         local fileManager = "pcmanfm"
         -- local menu = "wofi --show drun,run"
-        -- local menu = "noctalia msg panel-toggle launcher"
+        local menu = "noctalia msg panel-toggle launcher"
-        local menu = "noctalia-shell ipc call launcher toggle"
         local calculator = "qalculate-gtk"
         local browser = "firefox"
         local editor = "emacs"
@@ -115,7 +114,7 @@
       + "-- Monitor config\n"
       + lib.concatStringsSep "\n" (
         map (
-          monitor: "hl.monitor({ output = \"${monitor.name}\", mode = \"preferred\", position = \"auto\", scale = \"auto\", mirror = \"\"})"
+          monitor: "hl.monitor({ output = \"${monitor.name}\", mode = \"${toString monitor.width}x${toString monitor.height}@${toString monitor.refreshRate}\", position = \"${monitor.position}\", scale = \"auto\", mirror = \"\"})"
         )
         config.monitors
       )

homes/julian/features/hyprland/hyprland.lua

@@ -5,7 +5,7 @@
 -- See https://wiki.hypr.land/Configuring/Basics/Autostart/
 hl.on("hyprland.start", function()
 	-- hl.exec_cmd("waybar")
-	hl.exec_cmd("env QT_QPA_PLATFORMTHEME=qt5ct noctalia-shell") -- env ensures noctalia works alongside kde
+	hl.exec_cmd("env QT_QPA_PLATFORMTHEME=qt5ct noctalia") -- env ensures noctalia works alongside kde
 	hl.exec_cmd("firefox")
 	hl.exec_cmd("fcitx5 -d -r")
 end)
@@ -150,6 +150,13 @@ hl.bind(mainMod .. " + SHIFT + R", hl.dsp.exec_cmd("hyprctl reload"))
 hl.bind(mainMod .. " + PRINT", hl.dsp.exec_cmd("hyprshot-gui"))
 hl.bind("PRINT", hl.dsp.exec_cmd("hyprshot-gui"))
 hl.bind(mainMod .. " + P", hl.dsp.exec_cmd("toggle-screen-mirroring; correct-workspace-locations"))
+hl.bind(mainMod .. " + SHIFT + P", function()
+    hl.device({
+        name = "wacom-one-by-wacom-m-pen",
+        output = hl.get_active_monitor().name
+    })
+end)
+-- hyprctl eval 'hl.device({ name = "wacom-one-by-wacom-m-pen", output = hl.get_active_monitor().name })' 
 hl.bind(mainMod .. " + TAB", hl.dsp.exec_cmd("swaylock --daemonize"))
 hl.bind(mainMod .. " + W", hl.dsp.exec_cmd("makoctl dismiss"))
 hl.bind(mainMod .. " + SHIFT + W", hl.dsp.exec_cmd("makoctl restore"))

homes/julian/features/hyprland/noctalia.json

@@ -1,646 +0,0 @@
-{
-  "settingsVersion": 59,
-  "bar": {
-    "barType": "simple",
-    "position": "bottom",
-    "monitors": [],
-    "density": "default",
-    "showOutline": false,
-    "showCapsule": false,
-    "capsuleOpacity": 1,
-    "capsuleColorKey": "none",
-    "widgetSpacing": 6,
-    "contentPadding": 2,
-    "fontScale": 1,
-    "enableExclusionZoneInset": false,
-    "backgroundOpacity": 1,
-    "useSeparateOpacity": false,
-    "marginVertical": 4,
-    "marginHorizontal": 4,
-    "frameThickness": 8,
-    "frameRadius": 12,
-    "outerCorners": false,
-    "hideOnOverview": false,
-    "displayMode": "always_visible",
-    "autoHideDelay": 500,
-    "autoShowDelay": 150,
-    "showOnWorkspaceSwitch": true,
-    "widgets": {
-      "left": [
-        {
-          "characterCount": 2,
-          "colorizeIcons": false,
-          "emptyColor": "secondary",
-          "enableScrollWheel": true,
-          "focusedColor": "primary",
-          "followFocusedScreen": false,
-          "fontWeight": "bold",
-          "groupedBorderOpacity": 1,
-          "hideUnoccupied": false,
-          "iconScale": 0.8,
-          "id": "Workspace",
-          "labelMode": "index",
-          "occupiedColor": "secondary",
-          "pillSize": 0.8,
-          "showApplications": false,
-          "showApplicationsHover": false,
-          "showBadge": true,
-          "showLabelsOnlyWhenOccupied": false,
-          "unfocusedIconsOpacity": 1
-        }
-      ],
-      "center": [],
-      "right": [
-        {
-          "compactMode": false,
-          "diskPath": "/",
-          "iconColor": "none",
-          "id": "SystemMonitor",
-          "showCpuCores": false,
-          "showCpuFreq": false,
-          "showCpuTemp": false,
-          "showCpuUsage": true,
-          "showDiskAvailable": true,
-          "showDiskUsage": true,
-          "showDiskUsageAsPercent": false,
-          "showGpuTemp": false,
-          "showLoadAverage": false,
-          "showMemoryAsPercent": true,
-          "showMemoryUsage": true,
-          "showNetworkStats": false,
-          "showSwapUsage": false,
-          "textColor": "none",
-          "useMonospaceFont": true,
-          "usePadding": false
-        },
-        {
-          "compactMode": false,
-          "diskPath": "/",
-          "iconColor": "none",
-          "id": "SystemMonitor",
-          "showCpuCores": false,
-          "showCpuFreq": false,
-          "showCpuTemp": false,
-          "showCpuUsage": false,
-          "showDiskAvailable": false,
-          "showDiskUsage": false,
-          "showDiskUsageAsPercent": false,
-          "showGpuTemp": false,
-          "showLoadAverage": false,
-          "showMemoryAsPercent": false,
-          "showMemoryUsage": false,
-          "showNetworkStats": true,
-          "showSwapUsage": false,
-          "textColor": "none",
-          "useMonospaceFont": true,
-          "usePadding": false
-        },
-        {
-          "displayMode": "alwaysShow",
-          "iconColor": "none",
-          "id": "Volume",
-          "middleClickCommand": "pwvucontrol || pavucontrol",
-          "textColor": "none"
-        },
-        {
-          "deviceNativePath": "__default__",
-          "displayMode": "graphic-clean",
-          "hideIfIdle": false,
-          "hideIfNotDetected": true,
-          "id": "Battery",
-          "showNoctaliaPerformance": false,
-          "showPowerProfiles": false
-        },
-        {
-          "clockColor": "none",
-          "customFont": "",
-          "formatHorizontal": "ddd, dd.MM. HH:mm:ss",
-          "formatVertical": "HH mm - dd MM",
-          "id": "Clock",
-          "tooltipFormat": "HH:mm ddd, MMM dd",
-          "useCustomFont": false
-        },
-        {
-          "blacklist": [],
-          "chevronColor": "none",
-          "colorizeIcons": false,
-          "drawerEnabled": false,
-          "hidePassive": false,
-          "id": "Tray",
-          "pinned": []
-        }
-      ]
-    },
-    "mouseWheelAction": "workspace",
-    "reverseScroll": false,
-    "mouseWheelWrap": true,
-    "middleClickAction": "launcherPanel",
-    "middleClickFollowMouse": false,
-    "middleClickCommand": "",
-    "rightClickAction": "controlCenter",
-    "rightClickFollowMouse": true,
-    "rightClickCommand": "",
-    "screenOverrides": []
-  },
-  "general": {
-    "avatarImage": "/home/julian/.face",
-    "dimmerOpacity": 0.2,
-    "showScreenCorners": false,
-    "forceBlackScreenCorners": false,
-    "scaleRatio": 1,
-    "radiusRatio": 1,
-    "iRadiusRatio": 1,
-    "boxRadiusRatio": 1,
-    "screenRadiusRatio": 1,
-    "animationSpeed": 1,
-    "animationDisabled": false,
-    "compactLockScreen": false,
-    "lockScreenAnimations": false,
-    "lockOnSuspend": true,
-    "showSessionButtonsOnLockScreen": true,
-    "showHibernateOnLockScreen": false,
-    "enableLockScreenMediaControls": false,
-    "enableShadows": true,
-    "enableBlurBehind": true,
-    "shadowDirection": "bottom_right",
-    "shadowOffsetX": 2,
-    "shadowOffsetY": 3,
-    "language": "",
-    "allowPanelsOnScreenWithoutBar": true,
-    "showChangelogOnStartup": true,
-    "telemetryEnabled": false,
-    "enableLockScreenCountdown": false,
-    "lockScreenCountdownDuration": 10000,
-    "autoStartAuth": false,
-    "allowPasswordWithFprintd": false,
-    "clockStyle": "custom",
-    "clockFormat": "hh\\nmm",
-    "passwordChars": false,
-    "lockScreenMonitors": [],
-    "lockScreenBlur": 0,
-    "lockScreenTint": 0,
-    "keybinds": {
-      "keyUp": [
-        "Up"
-      ],
-      "keyDown": [
-        "Down"
-      ],
-      "keyLeft": [
-        "Left"
-      ],
-      "keyRight": [
-        "Right"
-      ],
-      "keyEnter": [
-        "Return",
-        "Enter"
-      ],
-      "keyEscape": [
-        "Esc"
-      ],
-      "keyRemove": [
-        "Del"
-      ]
-    },
-    "reverseScroll": false,
-    "smoothScrollEnabled": true
-  },
-  "ui": {
-    "fontDefault": "DejaVu Sans",
-    "fontFixed": "DejaVu Sans Mono",
-    "fontDefaultScale": 1,
-    "fontFixedScale": 1,
-    "tooltipsEnabled": true,
-    "scrollbarAlwaysVisible": true,
-    "boxBorderEnabled": false,
-    "panelBackgroundOpacity": 1,
-    "translucentWidgets": false,
-    "panelsAttachedToBar": true,
-    "settingsPanelMode": "attached",
-    "settingsPanelSideBarCardStyle": false
-  },
-  "location": {
-    "name": "",
-    "weatherEnabled": true,
-    "weatherShowEffects": true,
-    "weatherTaliaMascotAlways": false,
-    "useFahrenheit": false,
-    "use12hourFormat": false,
-    "showWeekNumberInCalendar": false,
-    "showCalendarEvents": true,
-    "showCalendarWeather": true,
-    "analogClockInCalendar": false,
-    "firstDayOfWeek": -1,
-    "hideWeatherTimezone": false,
-    "hideWeatherCityName": false,
-    "autoLocate": false
-  },
-  "calendar": {
-    "cards": [
-      {
-        "enabled": true,
-        "id": "calendar-header-card"
-      },
-      {
-        "enabled": true,
-        "id": "calendar-month-card"
-      },
-      {
-        "enabled": true,
-        "id": "weather-card"
-      }
-    ]
-  },
-  "wallpaper": {
-    "enabled": false,
-    "overviewEnabled": false,
-    "directory": "/home/julian/Pictures/Wallpapers",
-    "monitorDirectories": [],
-    "enableMultiMonitorDirectories": false,
-    "showHiddenFiles": false,
-    "viewMode": "single",
-    "setWallpaperOnAllMonitors": true,
-    "linkLightAndDarkWallpapers": true,
-    "fillMode": "crop",
-    "fillColor": "#000000",
-    "useSolidColor": false,
-    "solidColor": "#1a1a2e",
-    "automationEnabled": false,
-    "wallpaperChangeMode": "random",
-    "randomIntervalSec": 300,
-    "transitionDuration": 1500,
-    "transitionType": [
-      "fade",
-      "disc",
-      "stripes",
-      "wipe",
-      "pixelate",
-      "honeycomb"
-    ],
-    "skipStartupTransition": false,
-    "transitionEdgeSmoothness": 0.05,
-    "panelPosition": "follow_bar",
-    "hideWallpaperFilenames": false,
-    "useOriginalImages": false,
-    "overviewBlur": 0.4,
-    "overviewTint": 0.6,
-    "useWallhaven": false,
-    "wallhavenQuery": "",
-    "wallhavenSorting": "relevance",
-    "wallhavenOrder": "desc",
-    "wallhavenCategories": "111",
-    "wallhavenPurity": "100",
-    "wallhavenRatios": "",
-    "wallhavenApiKey": "",
-    "wallhavenResolutionMode": "atleast",
-    "wallhavenResolutionWidth": "",
-    "wallhavenResolutionHeight": "",
-    "sortOrder": "name",
-    "favorites": []
-  },
-  "appLauncher": {
-    "enableClipboardHistory": false,
-    "autoPasteClipboard": false,
-    "enableClipPreview": true,
-    "clipboardWrapText": true,
-    "enableClipboardSmartIcons": true,
-    "enableClipboardChips": true,
-    "clipboardWatchTextCommand": "wl-paste --type text --watch cliphist store",
-    "clipboardWatchImageCommand": "wl-paste --type image --watch cliphist store",
-    "position": "center",
-    "pinnedApps": [],
-    "sortByMostUsed": true,
-    "terminalCommand": "alacritty -e",
-    "customLaunchPrefixEnabled": false,
-    "customLaunchPrefix": "",
-    "viewMode": "list",
-    "showCategories": true,
-    "iconMode": "tabler",
-    "showIconBackground": false,
-    "enableSettingsSearch": true,
-    "enableWindowsSearch": true,
-    "enableSessionSearch": true,
-    "ignoreMouseInput": false,
-    "screenshotAnnotationTool": "",
-    "overviewLayer": false,
-    "density": "default"
-  },
-  "controlCenter": {
-    "position": "close_to_bar_button",
-    "diskPath": "/",
-    "shortcuts": {
-      "left": [
-        {
-          "id": "Network"
-        },
-        {
-          "id": "Bluetooth"
-        },
-        {
-          "id": "WallpaperSelector"
-        },
-        {
-          "id": "NoctaliaPerformance"
-        }
-      ],
-      "right": [
-        {
-          "id": "Notifications"
-        },
-        {
-          "id": "PowerProfile"
-        },
-        {
-          "id": "KeepAwake"
-        },
-        {
-          "id": "NightLight"
-        }
-      ]
-    },
-    "cards": [
-      {
-        "enabled": true,
-        "id": "profile-card"
-      },
-      {
-        "enabled": true,
-        "id": "shortcuts-card"
-      },
-      {
-        "enabled": true,
-        "id": "audio-card"
-      },
-      {
-        "enabled": false,
-        "id": "brightness-card"
-      },
-      {
-        "enabled": true,
-        "id": "weather-card"
-      },
-      {
-        "enabled": false,
-        "id": "media-sysmon-card"
-      }
-    ]
-  },
-  "systemMonitor": {
-    "cpuWarningThreshold": 80,
-    "cpuCriticalThreshold": 90,
-    "tempWarningThreshold": 80,
-    "tempCriticalThreshold": 90,
-    "gpuWarningThreshold": 80,
-    "gpuCriticalThreshold": 90,
-    "memWarningThreshold": 80,
-    "memCriticalThreshold": 90,
-    "swapWarningThreshold": 80,
-    "swapCriticalThreshold": 90,
-    "diskWarningThreshold": 80,
-    "diskCriticalThreshold": 90,
-    "diskAvailWarningThreshold": 20,
-    "diskAvailCriticalThreshold": 10,
-    "batteryWarningThreshold": 20,
-    "batteryCriticalThreshold": 5,
-    "enableDgpuMonitoring": false,
-    "useCustomColors": false,
-    "warningColor": "",
-    "criticalColor": "",
-    "externalMonitor": "resources || missioncenter || jdsystemmonitor || corestats || system-monitoring-center || gnome-system-monitor || plasma-systemmonitor || mate-system-monitor || ukui-system-monitor || deepin-system-monitor || pantheon-system-monitor"
-  },
-  "noctaliaPerformance": {
-    "disableWallpaper": true,
-    "disableDesktopWidgets": true
-  },
-  "dock": {
-    "enabled": false,
-    "position": "bottom",
-    "displayMode": "auto_hide",
-    "dockType": "floating",
-    "backgroundOpacity": 1,
-    "floatingRatio": 1,
-    "size": 1,
-    "onlySameOutput": true,
-    "monitors": [],
-    "pinnedApps": [],
-    "colorizeIcons": false,
-    "showLauncherIcon": false,
-    "launcherPosition": "end",
-    "launcherUseDistroLogo": false,
-    "launcherIcon": "",
-    "launcherIconColor": "none",
-    "pinnedStatic": false,
-    "inactiveIndicators": false,
-    "groupApps": false,
-    "groupContextMenuMode": "extended",
-    "groupClickAction": "cycle",
-    "groupIndicatorStyle": "dots",
-    "deadOpacity": 0.6,
-    "animationSpeed": 1,
-    "sitOnFrame": false,
-    "showDockIndicator": false,
-    "indicatorThickness": 3,
-    "indicatorColor": "primary",
-    "indicatorOpacity": 0.6
-  },
-  "network": {
-    "bluetoothRssiPollingEnabled": false,
-    "bluetoothRssiPollIntervalMs": 60000,
-    "networkPanelView": "wifi",
-    "wifiDetailsViewMode": "grid",
-    "bluetoothDetailsViewMode": "grid",
-    "bluetoothHideUnnamedDevices": false,
-    "disableDiscoverability": false,
-    "bluetoothAutoConnect": true
-  },
-  "sessionMenu": {
-    "enableCountdown": false,
-    "countdownDuration": 10000,
-    "position": "center",
-    "showHeader": true,
-    "showKeybinds": true,
-    "largeButtonsStyle": false,
-    "largeButtonsLayout": "single-row",
-    "powerOptions": [
-      {
-        "action": "lock",
-        "command": "",
-        "countdownEnabled": true,
-        "enabled": true,
-        "keybind": "1"
-      },
-      {
-        "action": "suspend",
-        "command": "",
-        "countdownEnabled": true,
-        "enabled": false,
-        "keybind": ""
-      },
-      {
-        "action": "hibernate",
-        "command": "",
-        "countdownEnabled": true,
-        "enabled": false,
-        "keybind": ""
-      },
-      {
-        "action": "reboot",
-        "command": "",
-        "countdownEnabled": true,
-        "enabled": true,
-        "keybind": "2"
-      },
-      {
-        "action": "logout",
-        "command": "",
-        "countdownEnabled": true,
-        "enabled": true,
-        "keybind": "3"
-      },
-      {
-        "action": "shutdown",
-        "command": "",
-        "countdownEnabled": true,
-        "enabled": true,
-        "keybind": "4"
-      },
-      {
-        "action": "rebootToUefi",
-        "command": "",
-        "countdownEnabled": true,
-        "enabled": false,
-        "keybind": ""
-      },
-      {
-        "action": "userspaceReboot",
-        "command": "",
-        "countdownEnabled": true,
-        "enabled": false,
-        "keybind": ""
-      }
-    ]
-  },
-  "notifications": {
-    "enabled": false,
-    "enableMarkdown": false,
-    "density": "default",
-    "monitors": [],
-    "location": "top_right",
-    "overlayLayer": true,
-    "backgroundOpacity": 1,
-    "respectExpireTimeout": false,
-    "lowUrgencyDuration": 3,
-    "normalUrgencyDuration": 8,
-    "criticalUrgencyDuration": 15,
-    "clearDismissed": true,
-    "saveToHistory": {
-      "low": true,
-      "normal": true,
-      "critical": true
-    },
-    "sounds": {
-      "enabled": false,
-      "volume": 0.5,
-      "separateSounds": false,
-      "criticalSoundFile": "",
-      "normalSoundFile": "",
-      "lowSoundFile": "",
-      "excludedApps": "discord,firefox,chrome,chromium,edge"
-    },
-    "enableMediaToast": false,
-    "enableKeyboardLayoutToast": true,
-    "enableBatteryToast": true
-  },
-  "osd": {
-    "enabled": true,
-    "location": "top_right",
-    "autoHideMs": 2000,
-    "overlayLayer": true,
-    "backgroundOpacity": 1,
-    "enabledTypes": [
-      0,
-      1,
-      2
-    ],
-    "monitors": []
-  },
-  "audio": {
-    "volumeStep": 5,
-    "volumeOverdrive": false,
-    "spectrumFrameRate": 30,
-    "visualizerType": "linear",
-    "spectrumMirrored": true,
-    "mprisBlacklist": [],
-    "preferredPlayer": "",
-    "volumeFeedback": false,
-    "volumeFeedbackSoundFile": ""
-  },
-  "brightness": {
-    "brightnessStep": 5,
-    "enforceMinimum": true,
-    "enableDdcSupport": false,
-    "backlightDeviceMappings": []
-  },
-  "colorSchemes": {
-    "useWallpaperColors": false,
-    "predefinedScheme": "Noctalia (default)",
-    "darkMode": true,
-    "schedulingMode": "off",
-    "manualSunrise": "06:30",
-    "manualSunset": "18:30",
-    "generationMethod": "tonal-spot",
-    "monitorForColors": "",
-    "syncGsettings": true
-  },
-  "templates": {
-    "activeTemplates": [],
-    "enableUserTheming": false
-  },
-  "nightLight": {
-    "enabled": true,
-    "forced": false,
-    "autoSchedule": true,
-    "nightTemp": "4000",
-    "dayTemp": "6500",
-    "manualSunrise": "06:30",
-    "manualSunset": "18:30"
-  },
-  "hooks": {
-    "enabled": false,
-    "wallpaperChange": "",
-    "darkModeChange": "",
-    "screenLock": "",
-    "screenUnlock": "",
-    "performanceModeEnabled": "",
-    "performanceModeDisabled": "",
-    "startup": "",
-    "session": "",
-    "colorGeneration": ""
-  },
-  "plugins": {
-    "autoUpdate": false,
-    "notifyUpdates": true
-  },
-  "idle": {
-    "enabled": false,
-    "screenOffTimeout": 600,
-    "lockTimeout": 660,
-    "suspendTimeout": 1800,
-    "fadeDuration": 5,
-    "screenOffCommand": "",
-    "lockCommand": "",
-    "suspendCommand": "",
-    "resumeScreenOffCommand": "",
-    "resumeLockCommand": "",
-    "resumeSuspendCommand": "",
-    "customCommands": "[]"
-  },
-  "desktopWidgets": {
-    "enabled": false,
-    "overviewEnabled": true,
-    "gridSnap": false,
-    "gridSnapScale": false,
-    "monitorWidgets": []
-  }
-}

homes/julian/features/suites/desktop/default.nix

@@ -53,7 +53,7 @@
     qpdfview
     # qutebrowser
     # realvnc-vnc-viewer
-    # rpi-imager # make isos
+    rpi-imager # make isos
     # rustdesk
     tor-browser
     rusty-path-of-building # Path of Building for poe1 and poe2
@@ -70,6 +70,9 @@
     networkmanager-openvpn
     keepassxc
 
+    unstable.joplin-desktop
+    unstable.libation
+
     ## My scripts
     frajul.open-messaging
     frajul.xwacomcalibrate

homes/julian/kardorf.nix

@@ -26,34 +26,44 @@
   is-nixos = true;
   terminal = "alacritty";
 
-  #  ---------   ---------
+  #  ----------   --------   ---------
-  # | DVI-D-1 | | DVI-D-2 |
+  # | HDMI-A-1 | |  DP-1  | | DVI-D-1 |
-  #  ---------   ---------
+  #  ----------   --------   ---------
   monitors = [
     {
-      name = "DVI-D-1";
+      name = "HDMI-A-1";
-      width = 1680;
+      width = 1920;
-      height = 1050;
+      height = 1080;
+      position = "0x0";
       workspaces = [
-        "1"
-        "2"
-        "3"
-        "4"
-        "5"
-      ];
-      primary = true;
-    }
-    {
-      name = "DVI-D-2";
-      width = 1680;
-      height = 1050;
-      workspaces = [
-        "6"
-        "7"
         "8"
         "9"
         "10"
       ];
     }
+    {
+      name = "DP-1";
+      width = 1680;
+      height = 1050;
+      position = "1920x0";
+      workspaces = [
+        "1"
+        "2"
+        "3"
+        "4"
+      ];
+      primary = true;
+    }
+    {
+      name = "DVI-D-1";
+      width = 1680;
+      height = 1050;
+      position = "3600x0";
+      workspaces = [
+        "5"
+        "6"
+        "7"
+      ];
+    }
   ];
 }

hosts/kardorf/default.nix

@@ -1,13 +1,9 @@
 {
   pwd,
   pkgs,
-  inputs,
   ...
 }: {
   imports = [
-    inputs.disko.nixosModules.disko
-
-    ./disko.nix
     ./hardware-configuration.nix
 
     "${pwd}/features-nixos/global"
@@ -47,8 +43,6 @@
     };
   };
 
-  networking.networkmanager.insertNameservers = ["192.168.3.252"];
-
   programs.kdeconnect.enable = true;
   programs.steam.enable = true;
 

hosts/kardorf/disko.nix

@@ -1,73 +0,0 @@
-# https://github.com/nix-community/disko/blob/master/example/btrfs-subvolumes.nix
-{
-  disko.devices = {
-    disk = {
-      main = {
-        type = "disk";
-        device = "/dev/sda";
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              priority = 1;
-              name = "ESP";
-              start = "1M";
-              end = "128M";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = ["umask=0077"];
-              };
-            };
-            root = {
-              size = "100%";
-              content = {
-                type = "btrfs";
-                extraArgs = ["-f"]; # Override existing partition
-                # Subvolumes must set a mountpoint in order to be mounted,
-                # unless their parent is mounted
-                subvolumes = {
-                  "/rootfs" = {
-                    mountpoint = "/";
-                  };
-                  "/home" = {
-                    mountOptions = ["compress=zstd"];
-                    mountpoint = "/home";
-                  };
-                  "/nix" = {
-                    mountOptions = [
-                      "compress=zstd"
-                      "noatime"
-                    ];
-                    mountpoint = "/nix";
-                  };
-                  # Subvolume for the swapfile
-                  "/swap" = {
-                    mountpoint = "/.swapvol";
-                    swap = {
-                      swapfile.size = "20M";
-                      swapfile2.size = "20M";
-                      swapfile2.path = "rel-path";
-                    };
-                  };
-                };
-
-                mountpoint = "/partition-root";
-                swap = {
-                  swapfile = {
-                    size = "20M";
-                  };
-                  swapfile1 = {
-                    size = "20M";
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}

hosts/kardorf/hardware-configuration.nix

@@ -3,23 +3,57 @@
   lib,
   modulesPath,
   ...
-}:
+}: {
-
-{
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
 
-  boot.initrd.availableKernelModules = [
+  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "sd_mod"];
-    "xhci_pci"
+  boot.initrd.kernelModules = [];
-    "ahci"
+  boot.kernelModules = ["kvm-intel"];
-    "usbhid"
+  boot.extraModulePackages = [];
-    "sd_mod"
+
-  ];
+  boot.loader.efi.efiSysMountPoint = "/boot/efi";
-  boot.initrd.kernelModules = [ ];
+
-  boot.kernelModules = [ "kvm-intel" ];
+  fileSystems."/" = {
-  boot.extraModulePackages = [ ];
+    device = "/dev/disk/by-uuid/97a9342e-0be0-4193-9a25-03400fc7da94";
+    fsType = "btrfs";
+    options = ["subvol=root"];
+  };
+
+  fileSystems."/nix" = {
+    device = "/dev/disk/by-uuid/97a9342e-0be0-4193-9a25-03400fc7da94";
+    fsType = "btrfs";
+    options = ["subvol=nix"];
+  };
+
+  fileSystems."/swap" = {
+    device = "/dev/disk/by-uuid/97a9342e-0be0-4193-9a25-03400fc7da94";
+    fsType = "btrfs";
+    options = ["subvol=swap"];
+  };
+
+  fileSystems."/home" = {
+    device = "/dev/disk/by-uuid/97a9342e-0be0-4193-9a25-03400fc7da94";
+    fsType = "btrfs";
+    options = ["subvol=home"];
+  };
+
+  fileSystems."/boot/efi" = {
+    device = "/dev/disk/by-uuid/7D48-A59C";
+    fsType = "vfat";
+    options = ["fmask=0022" "dmask=0022"];
+  };
+
+  swapDevices = [];
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+
+  services.xserver.videoDrivers = ["nvidia"];
+
+  hardware.nvidia = {
+    modesetting.enable = true;
+    open = false;
+  };
 }