diff options
| -rw-r--r-- | flake.lock | 79 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | hosts/nixos/home.nix | 2 | ||||
| -rw-r--r-- | modules/chromium.nix | 45 | ||||
| -rw-r--r-- | modules/default.nix | 3 | ||||
| -rw-r--r-- | modules/firefox.nix | 42 | ||||
| -rw-r--r-- | modules/foot.nix | 19 | ||||
| -rw-r--r-- | modules/git.nix | 3 | ||||
| -rw-r--r-- | modules/neovim/default.nix | 3 | ||||
| -rw-r--r-- | modules/nextcloud.nix | 2 | ||||
| -rw-r--r-- | modules/nixcord.nix | 6 | ||||
| -rw-r--r-- | modules/spicetify.nix | 2 | ||||
| -rw-r--r-- | modules/sway.nix | 20 | ||||
| -rw-r--r-- | modules/tmux.nix | 3 | ||||
| -rw-r--r-- | modules/waybar.nix | 2 | ||||
| -rw-r--r-- | modules/wezterm.nix | 4 | ||||
| -rw-r--r-- | modules/zathura.nix | 9 | ||||
| -rw-r--r-- | modules/zsh.nix | 10 |
18 files changed, 186 insertions, 70 deletions
@@ -46,6 +46,27 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": [ @@ -215,6 +236,42 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1746663147, + "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nur": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_4", + "treefmt-nix": "treefmt-nix_2" + }, + "locked": { + "lastModified": 1746899128, + "narHash": "sha256-Ptr+eEo1/TLYspc+AlZlcXeGj/MSnhFrAopFvRum1z8=", + "owner": "nix-community", + "repo": "NUR", + "rev": "04dc40b66404c504869a568150779a2f54d46b73", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", @@ -223,6 +280,7 @@ "nixcord": "nixcord", "nixpkgs": "nixpkgs_3", "nixpkgs-darwin": "nixpkgs-darwin", + "nur": "nur", "spicetify-nix": "spicetify-nix" } }, @@ -311,6 +369,27 @@ "repo": "treefmt-nix", "type": "github" } + }, + "treefmt-nix_2": { + "inputs": { + "nixpkgs": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", @@ -11,6 +11,8 @@ home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; + nur.url = "github:nix-community/NUR"; + spicetify-nix.url = "github:Gerg-L/spicetify-nix"; spicetify-nix.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/nixos/home.nix b/hosts/nixos/home.nix index 30576a5..2873d9c 100644 --- a/hosts/nixos/home.nix +++ b/hosts/nixos/home.nix @@ -12,7 +12,6 @@ programs.home-manager.enable = true; home.packages = with pkgs; [ - firefox obsidian jetbrains.idea-community-bin localsend @@ -80,6 +79,7 @@ waybar.enable = true; spicetify.enable = true; zathura.enable = true; + firefox.enable = true; vscode.enable = true; home.stateVersion = "24.11"; diff --git a/modules/chromium.nix b/modules/chromium.nix index ea4129b..fab8632 100644 --- a/modules/chromium.nix +++ b/modules/chromium.nix @@ -8,29 +8,26 @@ in { programs.chromium = { enable = true; package = pkgs.ungoogled-chromium; - extensions = - let - createChromiumExtensionFor = browserVersion: { id, sha256, version }: - { - inherit id; - crxPath = builtins.fetchurl { - url = "https://clients2.google.com/service/update2/crx?response=redirect&acceptformat=crx2,crx3&prodversion=${browserVersion}&x=id%3D${id}%26installsource%3Dondemand%26uc"; - name = "${id}.crx"; - inherit sha256; + extensions = let + createChromiumExtensionFor = browserVersion: { id, sha256, version }: { + inherit id; + crxPath = builtins.fetchurl { + url = "https://clients2.google.com/service/update2/crx?response=redirect&acceptformat=crx2,crx3&prodversion=${browserVersion}&x=id%3D${id}%26installsource%3Dondemand%26uc"; + name = "${id}.crx"; + inherit sha256; + }; + inherit version; }; - inherit version; - }; - createChromiumExtension = createChromiumExtensionFor (lib.versions.major pkgs.ungoogled-chromium.version); - in - [ - (createChromiumExtension { - # ublock origin - id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; - sha256 = "sha256:1lnk0k8zy0w33cxpv93q1am0d7ds2na64zshvbwdnbjq8x4sw5p6"; - version = "1.63.2"; - }) - ]; + createChromiumExtension = createChromiumExtensionFor (lib.versions.major pkgs.ungoogled-chromium.version); + in + [ + (createChromiumExtension { + # ublock origin + id = "cjpalhdlnbpafiamejdnhcphjbkeiagm"; + sha256 = "sha256:1lnk0k8zy0w33cxpv93q1am0d7ds2na64zshvbwdnbjq8x4sw5p6"; + version = "1.63.2"; + }) + ]; + }; }; - }; -} - +}
\ No newline at end of file diff --git a/modules/default.nix b/modules/default.nix index a879e9b..6449f63 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -15,5 +15,6 @@ ./chromium.nix ./nixcord.nix ./wezterm.nix + ./firefox.nix ]; -} +}
\ No newline at end of file diff --git a/modules/firefox.nix b/modules/firefox.nix new file mode 100644 index 0000000..8423ec4 --- /dev/null +++ b/modules/firefox.nix @@ -0,0 +1,42 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.firefox; +in { + options.enable = lib.mkEnableOption = "Setup firefox"; + + config = lib.mkIf cfg.enable { + program.firefox = { + enable = true; + extensions = with pkgs.nur.repos.rycee.firefox-addons; [ + ublock-origin + istilldontcareaboutcookies + sponsorblock + vimium-c + startpage-private-search + ]; + + userProfile = { + preferences = { + # Disable the Bookmarks Toolbar + "browser.toolbars.bookmarks.visibility" = "never"; + + # Disable Pocket + "extensions.pocket.enabled" = false; + + # Remove Firefox View + "browser.newtabpage.activity-stream.showSponsored" = false; + "browser.newtabpage.activity-stream.showSearch" = false; + "browser.newtabpage.activity-stream.showTopSites" = false; + "browser.newtabpage.activity-stream.showHighlights" = false; + + # privacy settings + "privacy.firstparty.isolate" = true; # Isolate cookies per site + "privacy.resistFingerprinting" = true; + "privacy.trackingprotection.enabled" = true; + }; + }; + }; + }; +} + diff --git a/modules/foot.nix b/modules/foot.nix index 9804db4..4fe4e4b 100644 --- a/modules/foot.nix +++ b/modules/foot.nix @@ -19,16 +19,16 @@ in { line-height = 12; }; - cursor = { - style = "underline"; - unfocused-style = "unchanged"; - blink = true; - }; + cursor = { + style = "underline"; + unfocused-style = "unchanged"; + blink = true; + }; colors = { - alpha=0.9; - # Gruvbox Theme - background = "000000"; + alpha = 0.9; + # Gruvbox Theme + background = "000000"; foreground = "ebdbb2"; regular0 = "282828"; @@ -52,5 +52,4 @@ in { }; }; }; -} - +}
\ No newline at end of file diff --git a/modules/git.nix b/modules/git.nix index c0c4385..caf445c 100644 --- a/modules/git.nix +++ b/modules/git.nix @@ -17,5 +17,4 @@ in { }; }; }; -} - +}
\ No newline at end of file diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix index 6374d66..e352b57 100644 --- a/modules/neovim/default.nix +++ b/modules/neovim/default.nix @@ -43,5 +43,4 @@ in { GIT_EDITOR = EDITOR; }; }; -} - +}
\ No newline at end of file diff --git a/modules/nextcloud.nix b/modules/nextcloud.nix index 6e8774f..9d9ba3c 100644 --- a/modules/nextcloud.nix +++ b/modules/nextcloud.nix @@ -36,4 +36,4 @@ in { startServices = true; }; }; -} +}
\ No newline at end of file diff --git a/modules/nixcord.nix b/modules/nixcord.nix index a969edf..fa0135b 100644 --- a/modules/nixcord.nix +++ b/modules/nixcord.nix @@ -3,13 +3,13 @@ let cfg = config.nixcord; in { - options.nixcord.enable = lib.mkEnableOption "Enable nixord and setup"; + options.nixcord.enable = lib.mkEnableOption "Enable nixcord and setup"; config = lib.mkIf cfg.enable { programs.nixcord = { enable = true; # enable Nixcord. Also installs discord package #quickCss = "some CSS"; # quickCSS file config = { - #useQuickCss = true; # use out quickCSS + #useQuickCss = true; # use our quickCSS #themeLinks = [ # or use an online theme # "https://raw.githubusercontent.com/link/to/some/theme.css" #]; @@ -25,4 +25,4 @@ in { }; }; }; -} +}
\ No newline at end of file diff --git a/modules/spicetify.nix b/modules/spicetify.nix index 0b618ad..6873d35 100644 --- a/modules/spicetify.nix +++ b/modules/spicetify.nix @@ -21,4 +21,4 @@ in { colorScheme = "Coral"; }; }; -} +}
\ No newline at end of file diff --git a/modules/sway.nix b/modules/sway.nix index c8dd008..a935c57 100644 --- a/modules/sway.nix +++ b/modules/sway.nix @@ -21,9 +21,9 @@ in { xdg-desktop-portal-wlr xdg-desktop-portal-gtk ]; - config = { - common.default = "*"; - }; + config = { + common.default = "*"; + }; }; }; @@ -49,17 +49,17 @@ in { border = 0; }; modifier = "Mod4"; - keybindings = lib.mkOptionDefault { - "${mod}+q" = "kill"; - "XF86AudioPlay" = "exec playerctl play-pause"; + keybindings = lib.mkOptionDefault { + "${mod}+q" = "kill"; + "XF86AudioPlay" = "exec playerctl play-pause"; "XF86AudioPrev" = "exec playerctl previous"; "XF86AudioNext" = "exec playerctl next"; "XF86AudioRaiseVolume" = "exec wpctl set-volume @DEFAULT_AUDIO_DEVICE@ +5%"; "XF86AudioLowerVolume" = "exec wpctl set-volume @DEFAULT_AUDIO_DEVICE@ -5%"; "XF86AudioMute" = "exec wpctl set-mute @DEFAULT_AUDIO_DEVICE@ toggle"; - }; - menu = "${pkgs.wmenu}/bin/wmenu-run -b -N 000000"; - terminal = "${pkgs.foot}/bin/foot"; + }; + menu = "${pkgs.wmenu}/bin/wmenu-run -b -N 000000"; + terminal = "${pkgs.foot}/bin/foot"; defaultWorkspace = "workspace number 1"; bars = [{ "command" = "${pkgs.waybar}/bin/waybar"; @@ -74,4 +74,4 @@ in { XDG_CURRENT_DESKTOP = "wayland"; }; }; -} +}
\ No newline at end of file diff --git a/modules/tmux.nix b/modules/tmux.nix index 4d200bb..57b4aae 100644 --- a/modules/tmux.nix +++ b/modules/tmux.nix @@ -22,5 +22,4 @@ in { ''; }; }; -} - +}
\ No newline at end of file diff --git a/modules/waybar.nix b/modules/waybar.nix index d88aed3..fccebd4 100644 --- a/modules/waybar.nix +++ b/modules/waybar.nix @@ -58,4 +58,4 @@ in { ''; }; }; -} +}
\ No newline at end of file diff --git a/modules/wezterm.nix b/modules/wezterm.nix index f2f8be4..c9e52ae 100644 --- a/modules/wezterm.nix +++ b/modules/wezterm.nix @@ -26,7 +26,7 @@ in { config.exit_behavior_messaging = 'None' return config - ''; + ''; }; }; -} +}
\ No newline at end of file diff --git a/modules/zathura.nix b/modules/zathura.nix index d3a789b..164c760 100644 --- a/modules/zathura.nix +++ b/modules/zathura.nix @@ -9,10 +9,10 @@ in { enable = true; options = { recolor-lightcolor = "rgba(0, 0, 0, 0)"; - recolor-darkcolor = "rgba(255, 255, 255, 1)"; - recolor = true; + recolor-darkcolor = "rgba(255, 255, 255, 1)"; + recolor = true; adjust-open = "width"; - guioptions = "none"; + guioptions = "none"; zoom-center = true; page-padding = 0; pages-per-row = 1; @@ -25,5 +25,4 @@ in { }; }; }; -} - +}
\ No newline at end of file diff --git a/modules/zsh.nix b/modules/zsh.nix index 3aca8a7..68b9a23 100644 --- a/modules/zsh.nix +++ b/modules/zsh.nix @@ -23,11 +23,11 @@ in { zstyle ':completion:*' squeeze-slashes true zstyle ':completion:*' add-space false - # Case-insensitive completion - zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}' + # Case-insensitive completion + zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}' - # vim keybdings - bindkey -v + # vim keybindings + bindkey -v eval "$(zoxide init zsh)" ''; @@ -47,4 +47,4 @@ in { }; }; }; -} +}
\ No newline at end of file |