diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix index 982b9a1..2ae8322 100644 --- a/hosts/desktop/configuration.nix +++ b/hosts/desktop/configuration.nix @@ -18,7 +18,6 @@ "external-speakers" "gaming" "link2c" - "llm" "plasma" "star-citizen" # keep-sorted end diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix index 2e6b0b8..aff95a3 100644 --- a/hosts/server/configuration.nix +++ b/hosts/server/configuration.nix @@ -30,12 +30,6 @@ fsType = "ext4"; options = [ "nofail" - "defaults" - "user" - "rw" - "utf8" - "noauto" - "umask=000" ]; }; diff --git a/modules/home-manager/bundles/dev.nix b/modules/home-manager/bundles/dev.nix index c5510a2..8b0003b 100644 --- a/modules/home-manager/bundles/dev.nix +++ b/modules/home-manager/bundles/dev.nix @@ -6,7 +6,6 @@ imports = util.toImports ../features [ # keep-sorted start "direnv" - "zed-editor" # keep-sorted end ]; } diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 797b6e2..eed9e76 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -6,13 +6,12 @@ imports = util.toImports ./features [ # keep-sorted start "agenix" + "bash" "bat" "bottom" "delta" "eza" "fd" - "fish" - "gh" "git" "lazygit" "shell-aliases" diff --git a/modules/home-manager/features/bash.nix b/modules/home-manager/features/bash.nix new file mode 100644 index 0000000..4f7de2a --- /dev/null +++ b/modules/home-manager/features/bash.nix @@ -0,0 +1,4 @@ +{ + home.shell.enableBashIntegration = true; + programs.bash.enable = true; +} diff --git a/modules/home-manager/features/firefox.nix b/modules/home-manager/features/firefox.nix index e7adee0..4231d89 100644 --- a/modules/home-manager/features/firefox.nix +++ b/modules/home-manager/features/firefox.nix @@ -75,7 +75,6 @@ # detect-cloudflare bitwarden dearrow - floccus nixpkgs-pr-tracker react-devtools return-youtube-dislikes diff --git a/modules/home-manager/features/zellij.nix b/modules/home-manager/features/zellij.nix index f7222ed..43d706b 100644 --- a/modules/home-manager/features/zellij.nix +++ b/modules/home-manager/features/zellij.nix @@ -4,7 +4,6 @@ settings = { theme = "catppuccin-mocha"; show_startup_tips = false; - default_shell = "fish"; }; }; } diff --git a/modules/home-manager/features/zoxide.nix b/modules/home-manager/features/zoxide.nix index 06cb837..61faad9 100644 --- a/modules/home-manager/features/zoxide.nix +++ b/modules/home-manager/features/zoxide.nix @@ -1,7 +1,6 @@ { programs.zoxide = { enable = true; - enableBashIntegration = true; options = [ "--cmd j" ]; diff --git a/modules/nixos/bundles/dev.nix b/modules/nixos/bundles/dev.nix index b9eb440..2af44dc 100644 --- a/modules/nixos/bundles/dev.nix +++ b/modules/nixos/bundles/dev.nix @@ -7,12 +7,7 @@ # keep-sorted start bacon cargo-info - devenv - just mask - # rusty-man - vscode # keep-sorted end ]; - } diff --git a/modules/nixos/bundles/gui.nix b/modules/nixos/bundles/gui.nix index d1b81bc..9459711 100644 --- a/modules/nixos/bundles/gui.nix +++ b/modules/nixos/bundles/gui.nix @@ -14,10 +14,10 @@ environment.systemPackages = with pkgs; [ # keep-sorted start - beeper cameractrls-gtk3 jellyfin-desktop - onlyoffice-desktopeditors + libreoffice + signal-desktop textsnatcher # keep-sorted end ]; diff --git a/modules/nixos/bundles/server.nix b/modules/nixos/bundles/server.nix index b7f4b53..7a6bac2 100644 --- a/modules/nixos/bundles/server.nix +++ b/modules/nixos/bundles/server.nix @@ -9,11 +9,9 @@ "caddy" "copyparty" "couchdb" - "firefly" "homepage-dashboard" "immich" "jellyfin" - "karakeep" "kavita" "lidarr" "miniflux" @@ -22,13 +20,11 @@ "paperless" "prowlarr" "qbittorrent" - "qui" "radarr" "radicale" "readarr" "sonarr" "syncthing" - "upbank2firefly" "vaultwarden" # keep-sorted end ]; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 0c733d4..c1243e6 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -26,8 +26,6 @@ # keep-sorted start broot # large directory browser choose # cut - circumflex # hacker news browsing - cointop # crypto ticker ddgr # web search doggo # dns dua # du diff --git a/modules/nixos/features/homepage-dashboard.nix b/modules/nixos/features/homepage-dashboard.nix index d56c755..2933366 100644 --- a/modules/nixos/features/homepage-dashboard.nix +++ b/modules/nixos/features/homepage-dashboard.nix @@ -26,7 +26,6 @@ let "bazarr" "immich" "jellyfin" - "karakeep" "kavita-api" "lidarr" "miniflux" @@ -138,13 +137,6 @@ in }; }; } - { - qui = { - description = "qBittorrent front end"; - icon = "qui.svg"; - href = "https://qui.fi33.buzz/"; - }; - } { qBittorrent = { description = "BitTorrent client"; @@ -204,18 +196,6 @@ in }; }; } - { - Karakeep = { - description = "Web clipper"; - icon = "karakeep.svg"; - href = "https://karakeep.fi33.buzz/"; - widget = { - type = "karakeep"; - url = "https://karakeep.fi33.buzz/"; - key = "@karakeep@"; - }; - }; - } { Miniflux = { description = "RSS aggregator"; @@ -259,13 +239,6 @@ in href = "https://couchdb.fi33.buzz/_utils/"; }; } - { - Firefly = { - description = "Budget Planner"; - icon = "firefly-iii.svg"; - href = "https://firefly.fi33.buzz/"; - }; - } { ntfy = { description = "Notification service"; @@ -324,7 +297,7 @@ in { Services = { style = "row"; - columns = 4; + columns = 3; useEqualHeights = true; }; }