diff --git a/configuration.nix b/configuration.nix index 0bcd6f0..5b71d32 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,4 +1,4 @@ -{ ... }@all: with all; { +{ pkgs, ... }@all: with all; { imports = [ inputs.sops-nix.nixosModules.sops ./system-modules/adb.nix diff --git a/flake.lock b/flake.lock index 9270878..4bae71b 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1760101617, - "narHash": "sha256-8jf/3ZCi+B7zYpIyV04+3wm72BD7Z801IlOzsOACR7I=", + "lastModified": 1762356719, + "narHash": "sha256-qwd/xdoOya1m8FENle+4hWnydCtlXUWLAW/Auk6WL7s=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "1826a9923881320306231b1c2090379ebf9fa4f8", + "rev": "6d0b3567584691bf9d8fedb5d0093309e2f979c7", "type": "github" }, "original": { @@ -39,11 +39,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1761517857, - "narHash": "sha256-1xYv73nGA+Lm/hKRqjiUyuBzabaRwmeDxBCIMve5CWU=", + "lastModified": 1762095388, + "narHash": "sha256-7Q8LtcvKWHbP8znARRTOY2tpU5WoV6FHwp5TZJOI8Us=", "owner": "9001", "repo": "copyparty", - "rev": "e9ab040ce8e72e299a3d8fbd109865b1e218eb57", + "rev": "ac085b8149ff50e03d260128596dd130ed1c7cae", "type": "github" }, "original": { @@ -102,11 +102,11 @@ "flake-compat_3": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -300,11 +300,11 @@ ] }, "locked": { - "lastModified": 1760445448, - "narHash": "sha256-fXGjL6dw31FPFRrmIemzGiNSlfvEJTJNsmadZi+qNhI=", + "lastModified": 1762462052, + "narHash": "sha256-6roLYzcDf4V38RUMSqycsOwAnqfodL6BmhRkUtwIgdA=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "50fb9f069219f338a11cf0bcccb9e58357d67757", + "rev": "ffc999d980c7b3bca85d3ebd0a9fbadf984a8162", "type": "github" }, "original": { @@ -318,8 +318,8 @@ "aquamarine": "aquamarine", "hyprcursor": "hyprcursor", "hyprgraphics": "hyprgraphics", + "hyprland-guiutils": "hyprland-guiutils", "hyprland-protocols": "hyprland-protocols", - "hyprland-qtutils": "hyprland-qtutils", "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", @@ -329,11 +329,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1761249114, - "narHash": "sha256-KDy8Vtlwe+7Z053HtD4fCRqlHBt0Kils0Zea4D77R7o=", + "lastModified": 1763427561, + "narHash": "sha256-7m7/uCNhBwUAB26QZs/pvFi1wlzpImnNCEF+a883oOs=", "ref": "refs/heads/main", - "rev": "aa5a239ac92a6bd6947cce2ca3911606df392cb6", - "revCount": 6522, + "rev": "edc311544a54a06ce4acb759b4d9a30853695452", + "revCount": 6618, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -344,33 +344,49 @@ "url": "https://github.com/hyprwm/Hyprland" } }, - "hyprland-plugins": { + "hyprland-guiutils": { "inputs": { - "hyprland": [ - "hyprland" + "aquamarine": [ + "hyprland", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprlang" + ], + "hyprtoolkit": "hyprtoolkit", + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprwayland-scanner" ], "nixpkgs": [ - "hyprland-plugins", "hyprland", "nixpkgs" ], "systems": [ - "hyprland-plugins", "hyprland", "systems" ] }, "locked": { - "lastModified": 1761653710, - "narHash": "sha256-MhHSU9m/9HSckJ61OXcom/6F92NQf3s1QfLbRUApalc=", + "lastModified": 1762755186, + "narHash": "sha256-ZjjETUHtoEhVN7JI1Cbt3p/KcXpK8ZQaPHx7UkG1OgA=", "owner": "hyprwm", - "repo": "hyprland-plugins", - "rev": "e689220b1740aa99ca67fa06055792f82fa9ed85", + "repo": "hyprland-guiutils", + "rev": "66356e20a8ed348aa49c1b9ceace786e224225b3", "type": "github" }, "original": { "owner": "hyprwm", - "repo": "hyprland-plugins", + "repo": "hyprland-guiutils", "type": "github" } }, @@ -399,74 +415,6 @@ "type": "github" } }, - "hyprland-qt-support": { - "inputs": { - "hyprlang": [ - "hyprland", - "hyprland-qtutils", - "hyprlang" - ], - "nixpkgs": [ - "hyprland", - "hyprland-qtutils", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-qtutils", - "systems" - ] - }, - "locked": { - "lastModified": 1749154592, - "narHash": "sha256-DO7z5CeT/ddSGDEnK9mAXm1qlGL47L3VAHLlLXoCjhE=", - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "rev": "4c8053c3c888138a30c3a6c45c2e45f5484f2074", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qt-support", - "type": "github" - } - }, - "hyprland-qtutils": { - "inputs": { - "hyprland-qt-support": "hyprland-qt-support", - "hyprlang": [ - "hyprland", - "hyprlang" - ], - "hyprutils": [ - "hyprland", - "hyprland-qtutils", - "hyprlang", - "hyprutils" - ], - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1759080228, - "narHash": "sha256-RgDoAja0T1hnF0pTc56xPfLfFOO8Utol2iITwYbUhTk=", - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "rev": "629b15c19fa4082e4ce6be09fdb89e8c3312aed7", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprland-qtutils", - "type": "github" - } - }, "hyprlang": { "inputs": { "hyprutils": [ @@ -483,11 +431,11 @@ ] }, "locked": { - "lastModified": 1758927902, - "narHash": "sha256-LZgMds7M94+vuMql2bERQ6LiFFdhgsEFezE4Vn+Ys3A=", + "lastModified": 1763254292, + "narHash": "sha256-JNgz3Fz2KMzkT7aR72wsgu/xNeJB//LSmdilh8Z/Zao=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "4dafa28d4f79877d67a7d1a654cddccf8ebf15da", + "rev": "deea98d5b61d066bdc7a68163edd2c4bd28d3a6b", "type": "github" }, "original": { @@ -496,6 +444,58 @@ "type": "github" } }, + "hyprtoolkit": { + "inputs": { + "aquamarine": [ + "hyprland", + "hyprland-guiutils", + "aquamarine" + ], + "hyprgraphics": [ + "hyprland", + "hyprland-guiutils", + "hyprgraphics" + ], + "hyprlang": [ + "hyprland", + "hyprland-guiutils", + "hyprlang" + ], + "hyprutils": [ + "hyprland", + "hyprland-guiutils", + "hyprutils" + ], + "hyprwayland-scanner": [ + "hyprland", + "hyprland-guiutils", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "hyprland", + "hyprland-guiutils", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-guiutils", + "systems" + ] + }, + "locked": { + "lastModified": 1762463729, + "narHash": "sha256-2fYkU/mdz8WKY3dkDPlE/j6hTxIwqultsx4gMMsMns0=", + "owner": "hyprwm", + "repo": "hyprtoolkit", + "rev": "88483bdee5329ec985f0c8f834c519cd18cfe532", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprtoolkit", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -508,11 +508,11 @@ ] }, "locked": { - "lastModified": 1759619523, - "narHash": "sha256-r1ed7AR2ZEb2U8gy321/Xcp1ho2tzn+gG1te/Wxsj1A=", + "lastModified": 1763323331, + "narHash": "sha256-+Z0OfCo1MS8/aIutSAW5aJR9zTae1wz9kcJYMgpwN6M=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3df7bde01efb3a3e8e678d1155f2aa3f19e177ef", + "rev": "0c6411851cc779d551edc89b83966696201611aa", "type": "github" }, "original": { @@ -627,11 +627,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1761563673, - "narHash": "sha256-d+1TpVAmRjcNBfjZsh2yQSdwUfN7Xgz1blJ185g73+A=", + "lastModified": 1763385941, + "narHash": "sha256-99CBNgyMvg3Zu/hxqixtShevrF4Kfr/qjtizQ6oseVI=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "a518cf710e5ebb935518dc7ac98e07e7ee5014c3", + "rev": "cc6483354b236c2fc95cc1d4ba1f0f40b7345e69", "type": "github" }, "original": { @@ -690,11 +690,11 @@ }, "nixpkgs-latest": { "locked": { - "lastModified": 1761810199, - "narHash": "sha256-iMLB/90mK7lncjk3GVYlAmN1K+D6/7JVhOSau3O7eK0=", + "lastModified": 1763477650, + "narHash": "sha256-PM2ykDLxh6V7cVFjn8WxmZjuogJK0VHTTLexu8LUtQs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d03f6e8ae73c291f8088abf52ae378c448a2cce3", + "rev": "e9bfdb3ed05b5b2df8226d31e256d8ee4c53edde", "type": "github" }, "original": { @@ -722,11 +722,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1761672384, - "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", + "lastModified": 1763283776, + "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", + "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", "type": "github" }, "original": { @@ -753,11 +753,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1761114652, - "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", + "lastModified": 1763283776, + "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", + "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a", "type": "github" }, "original": { @@ -785,11 +785,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1761373498, - "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "type": "github" }, "original": { @@ -801,11 +801,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1761468971, - "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=", + "lastModified": 1763334038, + "narHash": "sha256-LBVOyaH6NFzQ3X/c6vfMZ9k4SV2ofhpxeL9YnhHNJQQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e", + "rev": "4c8cdd5b1a630e8f72c9dd9bf582b1afb3127d2c", "type": "github" }, "original": { @@ -816,11 +816,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1756288264, - "narHash": "sha256-Om8adB1lfkU7D33VpR+/haZ2gI5r3Q+ZbIPzE5sYnwE=", + "lastModified": 1762286042, + "narHash": "sha256-OD5HsZ+sN7VvNucbrjiCz7CHF5zf9gP51YVJvPwYIH8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ddd1826f294a0ee5fdc198ab72c8306a0ea73aa9", + "rev": "12c1f0253aa9a54fdf8ec8aecaafada64a111e24", "type": "github" }, "original": { @@ -894,11 +894,11 @@ ] }, "locked": { - "lastModified": 1760663237, - "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", + "lastModified": 1763319842, + "narHash": "sha256-YG19IyrTdnVn0l3DvcUYm85u3PaqBt6tI6VvolcuHnA=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", + "rev": "7275fa67fbbb75891c16d9dee7d88e58aea2d761", "type": "github" }, "original": { @@ -940,7 +940,6 @@ "home-manager": "home-manager", "home-manager24": "home-manager24", "hyprland": "hyprland", - "hyprland-plugins": "hyprland-plugins", "lanzaboote": "lanzaboote", "nix-on-droid": "nix-on-droid", "nixos-wsl": "nixos-wsl", @@ -981,11 +980,11 @@ ] }, "locked": { - "lastModified": 1756348497, - "narHash": "sha256-xJp3VnoYh4kpsaKFO/7SsGbwOz7pI1ZmjbqpXEuR2cw=", + "lastModified": 1762396738, + "narHash": "sha256-BarSecuxtzp1boERdABLkkoxQTi6s/V33lJwUbWLrLY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "0adf92c70d23fb4f703aea5d3ebb51ac65994f7f", + "rev": "c63598992afd54d215d54f2b764adc0484c2b159", "type": "github" }, "original": { @@ -1017,11 +1016,11 @@ ] }, "locked": { - "lastModified": 1760998189, - "narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=", + "lastModified": 1763417348, + "narHash": "sha256-n5xDOeNN+smocQp3EMIc11IzBlR9wvvTIJZeL0g33Fs=", "owner": "Mic92", "repo": "sops-nix", - "rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3", + "rev": "3f66a7fb9626a9a9c077612ef10a0ce396286c7d", "type": "github" }, "original": { @@ -1088,11 +1087,11 @@ ] }, "locked": { - "lastModified": 1760713634, - "narHash": "sha256-5HXelmz2x/uO26lvW7MudnadbAfoBnve4tRBiDVLtOM=", + "lastModified": 1761431178, + "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "753bbbdf6a052994da94062e5b753288cef28dfb", + "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9", "type": "github" }, "original": { @@ -1108,11 +1107,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1761655046, - "narHash": "sha256-lG7eQqs8HDmmOl6vFkJ1iDlQBR+jY30uD4YtvWulCZc=", + "lastModified": 1763445380, + "narHash": "sha256-TGTZb9kJKq+z1Gn+39U9v6Ltsog2LhI7mZdf8/jcON4=", "owner": "sxyazi", "repo": "yazi", - "rev": "564b8851961a7545a93ebf04c0f8dd5778d0eccb", + "rev": "f9abe886ccfc801348be73f62c863beb87fd0bb0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 19231b5..73b015e 100644 --- a/flake.nix +++ b/flake.nix @@ -32,13 +32,7 @@ lanzaboote.url = "github:nix-community/lanzaboote/v0.4.2"; hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; - hyprland-plugins = { - url = "github:hyprwm/hyprland-plugins"; - inputs.hyprland.follows = "hyprland"; - }; - yazi.url = "github:sxyazi/yazi"; - copyparty.url = "github:9001/copyparty"; }; @@ -54,9 +48,10 @@ domain = "nx2.site"; home = "/home/${user}"; webroot = "/var/lib/hugo/nx2site/public"; + pkgs-version = "25.05"; }; - get-pkgs = { host, system?system, nixpkgs?inputs.nixpkgs, version?"25.05" }: import nixpkgs { + get-pkgs = let s = system; in { host, system?s, nixpkgs?inputs.nixpkgs, version?"25.05" }: import nixpkgs { inherit system config; overlays = [(final: prev: { unstable = import nixpkgs-unstable { inherit system config; }; @@ -109,6 +104,7 @@ system = "aarch64-linux"; user = "nix-on-droid"; home = "/data/data/com.termux.nix/files/home"; + pkgs-version = "24.05"; }; rice = import ./flake-modules/rice.nix pkgs; in { inherit inputs hyper rice; }; diff --git a/home-modules/bar/caldav-event.nix b/home-modules/bar/caldav-event.nix index 6b59e65..8a7f9ef 100644 --- a/home-modules/bar/caldav-event.nix +++ b/home-modules/bar/caldav-event.nix @@ -73,7 +73,7 @@ def get_ongoing_or_next_event(url, username, password): return next_event_dict except Exception as e: - print(f"Error accessing {url}: {e}") + print(f"Error accessing {url}: {str(e)[:30]}...") return None def is_expired(event_dict: dict): diff --git a/home-modules/calendar.nix b/home-modules/calendar.nix index 35cc933..e4104ce 100644 --- a/home-modules/calendar.nix +++ b/home-modules/calendar.nix @@ -33,27 +33,13 @@ read-only = true; type = "ics"; } - { - name = "LEC"; - url = "https://${domain}/lec.ics"; - color = "#A87000"; - read-only = true; - type = "ics"; - } - { - name = "LR"; - url = "https://${domain}/lr.ics"; - color = "#005040"; - read-only = true; - type = "ics"; - } - { - name = "Worlds"; - url = "https://zlypher.github.io/lol-events/cal/league-of-legends-world-championship.ical"; - color = "#A4C3DE"; - read-only = true; - type = "ics"; - } + # { + # name = "LEC"; + # url = "https://${domain}/lec.ics"; + # color = "#A87000"; + # read-only = true; + # type = "ics"; + # } { name = "Feiertage Hessen"; url = "https://ics.tools/Feiertage/hessen.ics"; diff --git a/home-modules/fish.nix b/home-modules/fish.nix index a1fe598..d0d419d 100644 --- a/home-modules/fish.nix +++ b/home-modules/fish.nix @@ -25,11 +25,11 @@ $(echo -e "$logo" | sed -n 4p): ''${XDG_CURRENT_DESKTOP^} $(echo -e "$logo" | sed -n 5p): ''${TERM^} $(echo -e "$logo" | sed -n 6p): $(bash --version | head --lines 1 | cut -f -4 -d' ' | sed -E 's-(.*?), version (.*?)\(.*-\1 \2-g') - $(echo -e "$logo" | sed -n 7p): fish $(fish --version | rev | cut -f 1 -d' ' | rev | sed 's/./\U&/') + $(echo -e "$logo" | sed -n 7p): fish $(fish --version | rev | cut -f 1 -d' ' | rev | sed 's/./\&/') $(echo -e "$logo" | sed -n 8p): ''$(uname -r | sed -E 's=(.+-.+-.+-.+)-.+=\1=g') - $(echo -e "$logo" | sed -n 9p): $($EDITOR --version | head -n 1 | sed -E 's-(.+?) \(.*-\1-g' | sed 's/./\U&/') + $(echo -e "$logo" | sed -n 9p): $($EDITOR --version | head -n 1 | sed -E 's-(.+?) \(.*-\1-g' | awk '{print toupper(substr($0,1,1)) substr($0,2)}') $(echo -e "$logo" | sed -n 10p): $(yazi --version | sed -E 's-(.*?) \(.*-\1-g') - $(echo -e "$logo" | sed -n 11p): $(starship --version | head -n 1 | sed 's/./\U&/') + $(echo -e "$logo" | sed -n 11p): $(starship --version | head -n 1 | awk '{print toupper(substr($0,1,1)) substr($0,2)}') " echo -e "$msg" '') diff --git a/home-modules/games.nix b/home-modules/games.nix index c7e7f6e..1cb3912 100644 --- a/home-modules/games.nix +++ b/home-modules/games.nix @@ -1,20 +1,19 @@ -{ pkgs, ... }@all: with all; -lib.mkIf (hyper.host == "NxNORTH") -{ +{ pkgs, ... }@all: with all; { home = { - packages = (with pkgs.unstable; [ - protonup-ng - mangohud - - prismlauncher - - # heroic - + packages = (with pkgs; [ + unstable.protonup-ng + unstable.mangohud + ]) ++ (if hyper.host == "NxNORTH" then (with pkgs; [ + unstable.prismlauncher + heroic # mindustry-wayland - ]) ++ [ pkgs.heroic ]; - sessionVariables = { - STEAM_EXTRA_COMPAT_TOOLS_PATHS = "\${HOME}/.steam/root/compatibilitytools.d"; - }; + ]) else if hyper.host == "NxXPS" then (with pkgs; [ + heroic + ]) else if hyper.host == "NxACE" then (with pkgs; [ + heroic + ]) else []); + + sessionVariables.STEAM_EXTRA_COMPAT_TOOLS_PATHS = "\${HOME}/.steam/root/compatibilitytools.d"; }; } diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index 8aa76ce..00e68a9 100644 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -6,6 +6,7 @@ monitors = { xps = { main = { name = "eDP-1"; resolution = "1920x1200"; position = "1920x1080"; scale = "1.0"; }; + # main = { name = "eDP-1"; resolution = "1920x1080"; position = "1920x1080"; scale = "1.0"; }; second = { name = "desc:Sony SONY TV 0x01010101"; resolution = "1920x1080"; position = "1920x0"; scale = "1.0"; }; third = { name = "DP-6"; resolution = "1920x1080"; position = "0x0"; scale = "1.0"; }; }; @@ -51,6 +52,7 @@ in { "${main.name}, ${main.resolution}, ${main.position}, ${main.scale}" "${second.name}, ${second.resolution}, ${second.position}, ${second.scale}" "${third.name}, ${third.resolution}, ${third.position}, ${third.scale}" + " ,preferred, auto, 1, mirror, eDP-1" ]) else (if hyper.host == "NxNORTH" then (with monitors.north; [ "${main.name}, ${main.resolution}, ${main.position}, ${main.scale}" "${left.name}, ${left.resolution}, ${left.position}, ${left.scale}" diff --git a/home-modules/rofi.nix b/home-modules/rofi.nix index 6a1ed01..b01c746 100644 --- a/home-modules/rofi.nix +++ b/home-modules/rofi.nix @@ -1,114 +1,46 @@ -{ pkgs, ... }@all: with all; -{ - home.packages = with pkgs; [ - rofi-wayland - ]; - home.file = let - trdr = "${rice.lib.float-to-drune rice.transparency}"; - in with rice.color; { - ".config/rofi/config.rasi".text = '' - configuration { - show-icons: false; - display-drun: ""; - disable-history: false; - drun-display-format: "{name} [({generic})] [({exec})]"; - } - - * { - font: "${rice.font.code.name} 12"; - foreground: ${foreground}; - background-color: ${background}${trdr}; - padding: 0px; - margin: 0px; - spacing: 0px; - border-width: 0px; - } - - #window { - background-color: ${background}${trdr}; - border: ${builtins.toString rice.border-width}px; - border-radius: ${builtins.toString rice.rounding}; - border-color: ${border}; - } - #mainbox { - border: 0; - padding: 0; - } - #message { - border: 0px; - } - #textbox { - text-color: ${foreground}; - } - #listview { - fixed-height: 0; - border: 0px; - spacing: 0px ; - scrollbar: false; - padding: 0px; - } - - - - #element { - border: 0; - padding: 0px; - border-radius: ${if rice.rounding > 0 then "2" else "0"}px; - } - - #element.normal.normal { background-color: ${background}${trdr}; text-color: ${accent.base}; } - #element.selected.normal { background-color: ${tertiary.base}${trdr}; text-color: ${background}; } - #element.alternate.normal { background-color: ${background}${trdr}; text-color: ${secondary.base}; } - - - #scrollbar { - width: ${builtins.toString rice.border-width}px ; - border: 0; - handle-width: 8px ; - padding: 0; - } - #sidebar { - border: ${builtins.toString rice.border-width}px dash; - } - #button.selected { - text-color: ${foreground}; - } - #inputbar { - spacing: 0; - text-color: ${background}; - background-color: ${accent.base}${trdr}; - padding: 0; - margine-bottom: 2px; - children: [ prompt,textbox-prompt-colon,entry,case-indicator ]; - } - #prompt { - spacing: 0; - background-color: transparent; - text-color: ${foreground}; - } - #textbox-prompt-colon { - expand: false; - str: ">"; - margin: 0px 0.3em 0em 0em ; - text-color: ${background}; - background-color: transparent; - } - #case-indicator { - spacing: 0; - text-color: ${foreground}; - background-color: transparent; - } - #entry { - spacing: 0; - text-color: ${background}; - background-color: transparent; - placeholder: ""; - } - - element-text, element-icon { - background-color: inherit; - text-color: inherit; - } - ''; +{ pkgs, ... }@all: with all; { + home = { + packages = with pkgs; [ rofi-wayland ]; + file = let # the home-manager module sucks + trdr = "${rice.lib.float-to-drune rice.transparency}"; + ts = builtins.toString; + in with rice.color; { + ".config/rofi/config.rasi".text = '' + configuration { + show-icons: false; + display-drun: ""; + disable-history: false; + } + * { + font: "${rice.font.code.name} 12"; + foreground: ${foreground}; + text-color: ${foreground}; + background-color: transparent; + padding: 0px; + margin: 0px; + spacing: 0px; + border-width: 0px; + } + window { + background-color: ${background}${trdr}; + border: ${ts rice.border-width}px; + border-radius: ${ts rice.rounding}px; + border-color: ${ts rice.color.border}; + } + listview { scrollbar: false; } + element { border-radius: ${ts rice.rounding}px; } + element.normal.normal { background-color: ${accent.darker}; text-color: ${accent.base}; } + element.selected.normal { background-color: ${accent.base}; text-color: ${accent.bright}; } + element.alternate.normal { background-color: ${secondary.darker}; text-color: ${secondary.base}; } + inputbar { children: [ prompt,textbox-prompt-colon,entry,case-indicator ]; } + prompt { } + textbox-prompt-colon { + expand: false; + str: ">"; + } + case-indicator { } + entry { placeholder: ""; } + ''; + }; }; } diff --git a/system-modules/calendar/lec.nix b/system-modules/calendar/lec.nix index b00c8fc..7db416a 100644 --- a/system-modules/calendar/lec.nix +++ b/system-modules/calendar/lec.nix @@ -1,7 +1,7 @@ { pkgs, ... }@all: with all; { systemd.timers."nx_cal_lec" = { - enable = true; + enable = false; wantedBy = [ "timers.target" ]; timerConfig = { OnBootSec = "40m"; diff --git a/system-modules/games.nix b/system-modules/games.nix index 5d90705..a54913e 100644 --- a/system-modules/games.nix +++ b/system-modules/games.nix @@ -1,15 +1,7 @@ -{ pkgs, ... }@all: with all; -lib.mkIf (hyper.host == "NxNORTH" || hyper.host == "NxACE") -{ +{ pkgs, ... }@all: with all; { programs = { - steam = { - enable = true; - }; - gamemode = { - enable = true; - }; - gamescope = { - enable = true; - }; + steam.enable = true; + gamemode.enable = true; + gamescope.enable = true; }; } diff --git a/system-modules/users.nix b/system-modules/users.nix index b6c11c5..22cc8d5 100644 --- a/system-modules/users.nix +++ b/system-modules/users.nix @@ -31,6 +31,7 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE5sYVtPLHXatTjrpol46xr9R4TidcB4t8axO6/ReNNR nxxps-nx2@nxace" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC/zcoYuYbamTPMOZPfsP1yQJ5Y6sDlPfBwui8MQjKWn nxnorth-nx2@nxace" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMnbJx7nVeVi5jK1Eybm+jQoopiCTslewuHFLv2yCt4f nxdcs-nx2@nxace" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHOWa0xeARLSGbliVCqloGRvF7KlM6TcJSFhd+BxcvRt nxs23u-nx2@ssh.nx2.site" ]; }; };