From dfff773f7e7dabb328ae472d89330870ca96801d Mon Sep 17 00:00:00 2001 From: Menno van Leeuwen Date: Thu, 2 Jan 2025 00:59:22 +0100 Subject: [PATCH] moves various things to home manager --- bin/actions/upgrade.sh | 30 ++- config/autostart/ulauncher.desktop | 2 +- .../org.fedoraproject.MediaWriter.flatpakref | 10 + config/home-manager/flake.lock | 136 ++++++++++++- config/home-manager/flake.nix | 19 +- .../packages/workstation/1password.nix | 16 ++ .../packages/workstation/ghostty.nix | 6 + .../packages/workstation/steam.nix | 7 + config/nixos/flake.lock | 184 +++--------------- config/nixos/flake.nix | 4 - .../nixos/packages/workstation/1password.nix | 25 --- config/nixos/packages/workstation/default.nix | 5 +- config/nixos/packages/workstation/ghostty.nix | 10 - config/nixos/packages/workstation/steam.nix | 13 -- 14 files changed, 237 insertions(+), 230 deletions(-) create mode 100644 config/flatpaks/org.fedoraproject.MediaWriter.flatpakref create mode 100644 config/home-manager/packages/workstation/1password.nix create mode 100644 config/home-manager/packages/workstation/ghostty.nix create mode 100644 config/home-manager/packages/workstation/steam.nix delete mode 100644 config/nixos/packages/workstation/1password.nix delete mode 100644 config/nixos/packages/workstation/ghostty.nix delete mode 100644 config/nixos/packages/workstation/steam.nix diff --git a/bin/actions/upgrade.sh b/bin/actions/upgrade.sh index bf7b7d5..92ec834 100755 --- a/bin/actions/upgrade.sh +++ b/bin/actions/upgrade.sh @@ -40,24 +40,34 @@ fi printfe "%s\n" "cyan" "Limiting to $CORES cores with $JOBS jobs." if [[ "$RUN_NIX" == true ]]; then - printfe "%s\n" "cyan" "Upgrading NixOS packages..." - cd $HOME/dotfiles/config/nixos && sudo nixos-rebuild switch --upgrade --flake .#$DOTF_HOSTNAME --impure --cores $CORES -j $JOBS + if command -v nixos-rebuild &> /dev/null; then + printfe "%s\n" "cyan" "Upgrading NixOS packages..." + cd $HOME/dotfiles/config/nixos && sudo nixos-rebuild switch --upgrade --flake .#$DOTF_HOSTNAME --impure --cores $CORES -j $JOBS - if [[ $? -ne 0 ]]; then - printfe "%s\n" "red" "Failed to upgrade NixOS packages." + if [[ $? -ne 0 ]]; then + printfe "%s\n" "red" "Failed to upgrade NixOS packages." + exit 1 + fi + else + printfe "%s\n" "red" "NixOS is not installed." exit 1 fi fi if [[ "$RUN_HA" == true ]]; then - printfe "%s\n" "cyan" "Cleaning old backup files..." - rm -rf $HOME/.config/mimeapps.list.backup + if command -v home-manager &> /dev/null; then + printfe "%s\n" "cyan" "Cleaning old backup files..." + rm -rf $HOME/.config/mimeapps.list.backup - printfe "%s\n" "cyan" "Upgrading Home Manager packages..." - cd $HOME/dotfiles/config/home-manager && NIXPKGS_ALLOW_UNFREE=1 home-manager switch -b backup --flake .#$DOTF_HOSTNAME --impure --cores $CORES -j $JOBS + printfe "%s\n" "cyan" "Upgrading Home Manager packages..." + cd $HOME/dotfiles/config/home-manager && NIXPKGS_ALLOW_UNFREE=1 home-manager switch -b backup --flake .#$DOTF_HOSTNAME --impure --cores $CORES -j $JOBS - if [[ $? -ne 0 ]]; then - printfe "%s\n" "red" "Failed to upgrade Home Manager packages." + if [[ $? -ne 0 ]]; then + printfe "%s\n" "red" "Failed to upgrade Home Manager packages." + exit 1 + fi + else + printfe "%s\n" "red" "Home Manager is not installed." exit 1 fi fi diff --git a/config/autostart/ulauncher.desktop b/config/autostart/ulauncher.desktop index 829e188..7a6e4ab 120000 --- a/config/autostart/ulauncher.desktop +++ b/config/autostart/ulauncher.desktop @@ -1 +1 @@ -/nix/store/c9d6gxqsxdxk6fki5844wv0c6yrx86n1-home-manager-files/.config/autostart/ulauncher.desktop \ No newline at end of file +/nix/store/b21375qzs3rbmhz9wrvyab7jljis7jc3-home-manager-files/.config/autostart/ulauncher.desktop \ No newline at end of file diff --git a/config/flatpaks/org.fedoraproject.MediaWriter.flatpakref b/config/flatpaks/org.fedoraproject.MediaWriter.flatpakref new file mode 100644 index 0000000..9f1d4a9 --- /dev/null +++ b/config/flatpaks/org.fedoraproject.MediaWriter.flatpakref @@ -0,0 +1,10 @@ +[Flatpak Ref] +Name=org.fedoraproject.MediaWriter +Branch=stable +Title=org.fedoraproject.MediaWriter from flathub +IsRuntime=false +Url=https://dl.flathub.org/repo/ +SuggestRemoteName=flathub +GPGKey=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 +RuntimeRepo=https://dl.flathub.org/repo/flathub.flatpakrepo + diff --git a/config/home-manager/flake.lock b/config/home-manager/flake.lock index 7199614..7096a89 100644 --- a/config/home-manager/flake.lock +++ b/config/home-manager/flake.lock @@ -1,5 +1,60 @@ { "nodes": { + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "ghostty": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-unstable": "nixpkgs-unstable", + "zig": "zig" + }, + "locked": { + "lastModified": 1735765328, + "narHash": "sha256-f4LI34cXP8nOTi4Va6GPUFaJYf0qGbabk+OeUddsfuk=", + "owner": "ghostty-org", + "repo": "ghostty", + "rev": "94599102e9fb8247af08cbbbcb7ee25e3d31e1bd", + "type": "github" + }, + "original": { + "owner": "ghostty-org", + "repo": "ghostty", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -23,11 +78,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735412871, - "narHash": "sha256-Qoz0ow6jDGUIBHxduc7Y1cjYFS71tvEGJV5Src/mj98=", + "lastModified": 1735669367, + "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f94733f93e4fe6e82f516efae007096e4ab5a21", + "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9", "type": "github" }, "original": { @@ -37,7 +92,39 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1733423277, + "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e36963a147267afc055f7cf65225958633e536bf", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { + "locked": { + "lastModified": 1733229606, + "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable_2": { "locked": { "lastModified": 1735471104, "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", @@ -55,9 +142,50 @@ }, "root": { "inputs": { + "ghostty": "ghostty", "home-manager": "home-manager", "nixpkgs": "nixpkgs", - "nixpkgs-unstable": "nixpkgs-unstable" + "nixpkgs-unstable": "nixpkgs-unstable_2" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "zig": { + "inputs": { + "flake-compat": [ + "ghostty" + ], + "flake-utils": "flake-utils", + "nixpkgs": [ + "ghostty", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1717848532, + "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" } } }, diff --git a/config/home-manager/flake.nix b/config/home-manager/flake.nix index 60cf868..e21ebdb 100644 --- a/config/home-manager/flake.nix +++ b/config/home-manager/flake.nix @@ -9,6 +9,7 @@ url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; + ghostty.url = "github:ghostty-org/ghostty"; }; outputs = @@ -17,6 +18,7 @@ nixpkgs, nixpkgs-unstable, home-manager, + ghostty, }: let system = "x86_64-linux"; @@ -35,7 +37,11 @@ inherit pkgs; modules = [ ./home.nix ]; extraSpecialArgs = { - inherit pkgs pkgs-unstable; + inherit + pkgs + pkgs-unstable + ghostty + ; isServer = false; hostname = "mennos-gamingpc"; }; @@ -45,7 +51,10 @@ inherit pkgs; modules = [ ./home.nix ]; extraSpecialArgs = { - inherit pkgs pkgs-unstable; + inherit + pkgs + pkgs-unstable + ; isServer = true; hostname = "mennos-server"; }; @@ -55,7 +64,11 @@ inherit pkgs; modules = [ ./home.nix ]; extraSpecialArgs = { - inherit pkgs pkgs-unstable; + inherit + pkgs + pkgs-unstable + ghostty + ; isServer = false; hostname = "mennos-laptop"; }; diff --git a/config/home-manager/packages/workstation/1password.nix b/config/home-manager/packages/workstation/1password.nix new file mode 100644 index 0000000..951329d --- /dev/null +++ b/config/home-manager/packages/workstation/1password.nix @@ -0,0 +1,16 @@ +{ pkgs, pkgs-unstable, ... }: +{ + home.packages = [ + pkgs-unstable._1password-cli + pkgs-unstable._1password-gui + ]; + + xdg.configFile."1password/custom_allowed_browsers" = { + text = '' + firefox + brave + zen + ''; + executable = true; + }; +} diff --git a/config/home-manager/packages/workstation/ghostty.nix b/config/home-manager/packages/workstation/ghostty.nix new file mode 100644 index 0000000..f61247b --- /dev/null +++ b/config/home-manager/packages/workstation/ghostty.nix @@ -0,0 +1,6 @@ +{ ghostty, pkgs, ... }: +{ + home.packages = [ + ghostty.packages.${pkgs.system}.default + ]; +} diff --git a/config/home-manager/packages/workstation/steam.nix b/config/home-manager/packages/workstation/steam.nix new file mode 100644 index 0000000..47afbc8 --- /dev/null +++ b/config/home-manager/packages/workstation/steam.nix @@ -0,0 +1,7 @@ +{ pkgs, pkgs-unstable, ... }: +{ + home.packages = with pkgs; [ + steamcmd + steam-tui + ]; +} diff --git a/config/nixos/flake.lock b/config/nixos/flake.lock index d61be18..f2a8ac1 100644 --- a/config/nixos/flake.lock +++ b/config/nixos/flake.lock @@ -50,22 +50,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1717312683, @@ -81,45 +65,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "ghostty": { - "inputs": { - "flake-compat": "flake-compat", - "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable", - "zig": "zig" - }, - "locked": { - "lastModified": 1735535921, - "narHash": "sha256-cfsHww91bRA2Frni54+blIGZGU9/269vaWzeGcNRNN0=", - "owner": "ghostty-org", - "repo": "ghostty", - "rev": "87bd0bb744d6a1c45022aa39f21219d0b6ff3261", - "type": "github" - }, - "original": { - "owner": "ghostty-org", - "repo": "ghostty", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -212,15 +157,15 @@ "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_2", + "systems": "systems", "xdph": "xdph" }, "locked": { - "lastModified": 1735556315, - "narHash": "sha256-u5odETOAAJGnqJr+WxqNX1Y6/iiMIiACnB3W63aNGdo=", + "lastModified": 1735774442, + "narHash": "sha256-G11VtBRItUM2iAn9bVGdf1w++YB1xn50ruPulGCUj+0=", "owner": "hyprwm", "repo": "hyprland", - "rev": "8c14c2a5f472cf3d361d3cbb90ee7d2d455aae08", + "rev": "dde3e082c96cd6987420556bfc430cd5b8e0980c", "type": "github" }, "original": { @@ -271,11 +216,11 @@ ] }, "locked": { - "lastModified": 1728345020, - "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=", + "lastModified": 1735734474, + "narHash": "sha256-9OV4lOqrEJVLdOrpNN/9msNwAhI6FQTu4N7fufilG08=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "a7c183800e74f337753de186522b9017a07a8cee", + "rev": "271df559dd30e4bc5ec6af02d017ac0aaabd63a7", "type": "github" }, "original": { @@ -394,17 +339,17 @@ }, "nixos-cosmic": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "nixpkgs": "nixpkgs_2", - "nixpkgs-stable": "nixpkgs-stable_3", + "nixpkgs-stable": "nixpkgs-stable_2", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1735522648, - "narHash": "sha256-A73vDMGBEq9KwUMmtMkg3zvReMsdRrb1ruXjNjzJh+I=", + "lastModified": 1735695461, + "narHash": "sha256-xWeCORE1NA95dt3m1wGTmWFao8uMtmysK26jVcsL1tI=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "6f74fba14f206b6e74ed5d2320facf9c43c3771a", + "rev": "80d9501f798baa8d55d86398142bc94db7619d8e", "type": "github" }, "original": { @@ -430,22 +375,6 @@ } }, "nixpkgs-stable": { - "locked": { - "lastModified": 1733423277, - "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e36963a147267afc055f7cf65225958633e536bf", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { "locked": { "lastModified": 1730741070, "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", @@ -461,13 +390,13 @@ "type": "github" } }, - "nixpkgs-stable_3": { + "nixpkgs-stable_2": { "locked": { - "lastModified": 1735264675, - "narHash": "sha256-MgdXpeX2GuJbtlBrH9EdsUeWl/yXEubyvxM1G+yO4Ak=", + "lastModified": 1735531152, + "narHash": "sha256-As8I+ebItDKtboWgDXYZSIjGlKeqiLBvjxsQHUmAf1Q=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d49da4c08359e3c39c4e27c74ac7ac9b70085966", + "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", "type": "github" }, "original": { @@ -478,22 +407,6 @@ } }, "nixpkgs-unstable": { - "locked": { - "lastModified": 1733229606, - "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable_2": { "locked": { "lastModified": 1735471104, "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", @@ -511,11 +424,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735291276, - "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", + "lastModified": 1735471104, + "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", + "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4", "type": "github" }, "original": { @@ -527,11 +440,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1735412871, - "narHash": "sha256-Qoz0ow6jDGUIBHxduc7Y1cjYFS71tvEGJV5Src/mj98=", + "lastModified": 1735669367, + "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f94733f93e4fe6e82f516efae007096e4ab5a21", + "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9", "type": "github" }, "original": { @@ -543,13 +456,13 @@ }, "pre-commit-hooks": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "gitignore": "gitignore", "nixpkgs": [ "hyprland", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { "lastModified": 1734797603, @@ -567,12 +480,11 @@ }, "root": { "inputs": { - "ghostty": "ghostty", "hyprland": "hyprland", "hyprland-plugins": "hyprland-plugins", "nixos-cosmic": "nixos-cosmic", "nixpkgs": "nixpkgs_3", - "nixpkgs-unstable": "nixpkgs-unstable_2" + "nixpkgs-unstable": "nixpkgs-unstable" } }, "rust-overlay": { @@ -583,11 +495,11 @@ ] }, "locked": { - "lastModified": 1735439489, - "narHash": "sha256-IysonaW/cItfmMuvg43flOqMgS4N0C6yKJobCa09XOQ=", + "lastModified": 1735612067, + "narHash": "sha256-rsjojgfPUf9tWuMXuuo2KAIoUZ49XGZQJSjFGOO8Cq4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "915d7c42a706f9191696d1b779cf1ea1769d34a8", + "rev": "d199142e84bfaae476ffb4e09a70879d7918784d", "type": "github" }, "original": { @@ -597,21 +509,6 @@ } }, "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -666,31 +563,6 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } - }, - "zig": { - "inputs": { - "flake-compat": [ - "ghostty" - ], - "flake-utils": "flake-utils", - "nixpkgs": [ - "ghostty", - "nixpkgs-stable" - ] - }, - "locked": { - "lastModified": 1717848532, - "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } } }, "root": "root", diff --git a/config/nixos/flake.nix b/config/nixos/flake.nix index f42a6d8..c236c5a 100644 --- a/config/nixos/flake.nix +++ b/config/nixos/flake.nix @@ -10,7 +10,6 @@ url = "github:hyprwm/hyprland-plugins"; inputs.hyprland.follows = "hyprland"; }; - ghostty.url = "github:ghostty-org/ghostty"; }; outputs = @@ -20,7 +19,6 @@ nixpkgs-unstable, hyprland, hyprland-plugins, - ghostty, nixos-cosmic, }: let @@ -50,7 +48,6 @@ pkgs-unstable hyprland hyprland-plugins - ghostty nixos-cosmic ; isWorkstation = true; @@ -70,7 +67,6 @@ pkgs-unstable hyprland hyprland-plugins - ghostty nixos-cosmic ; isWorkstation = true; diff --git a/config/nixos/packages/workstation/1password.nix b/config/nixos/packages/workstation/1password.nix deleted file mode 100644 index 8923165..0000000 --- a/config/nixos/packages/workstation/1password.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ pkgs, pkgs-unstable, ... }: -{ - # Enables the 1Password CLI - programs._1password = { - enable = true; - }; - - # Enables the 1Password desktop app - programs._1password-gui = { - enable = true; - polkitPolicyOwners = [ "menno" ]; - package = pkgs-unstable._1password-gui; - }; - - environment.etc = { - "1password/custom_allowed_browsers" = { - text = '' - firefox - brave - zen - ''; - mode = "0755"; - }; - }; -} diff --git a/config/nixos/packages/workstation/default.nix b/config/nixos/packages/workstation/default.nix index b5dd110..bfdbcc1 100644 --- a/config/nixos/packages/workstation/default.nix +++ b/config/nixos/packages/workstation/default.nix @@ -2,10 +2,7 @@ { # Import all the package modules imports = [ - ./1password.nix - ./flatpak.nix - ./steam.nix ./hyprland.nix - ./ghostty.nix + ./flatpak.nix ]; } diff --git a/config/nixos/packages/workstation/ghostty.nix b/config/nixos/packages/workstation/ghostty.nix deleted file mode 100644 index a4ac274..0000000 --- a/config/nixos/packages/workstation/ghostty.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ ghostty, pkgs, ... }: -{ - # Known issue: https://ghostty.org/docs/help/terminfo - # Issue output such as: tput: unknown terminal "xterm-ghostty" - # Simply run: - # $ infocmp -x | ssh SERVER_TO_FIX -- tic -x - - environment.systemPackages = [ - ghostty.packages.x86_64-linux.default - ]; -} diff --git a/config/nixos/packages/workstation/steam.nix b/config/nixos/packages/workstation/steam.nix deleted file mode 100644 index f37bef9..0000000 --- a/config/nixos/packages/workstation/steam.nix +++ /dev/null @@ -1,13 +0,0 @@ -# In your configuration.nix -{ config, pkgs, ... }: -{ - programs.steam = { - enable = true; - # Open ports in the firewall for Steam Remote Play - remotePlay.openFirewall = true; - # Open ports in the firewall for Source Dedicated Server - dedicatedServer.openFirewall = true; - # Open ports in the firewall for Steam Local Network Game Transfers - localNetworkGameTransfers.openFirewall = true; - }; -}