diff options
| -rw-r--r-- | common/default.nix | 2 | ||||
| -rw-r--r-- | common/home/default.nix | 3 | ||||
| -rw-r--r-- | common/home/hyprland/default.nix | 3 | ||||
| -rw-r--r-- | common/home/programs/neomutt/default.nix | 5 | ||||
| -rw-r--r-- | common/home/programs/waybar/default.nix | 7 | ||||
| -rw-r--r-- | common/home/programs/waybar/style.css | 5 | ||||
| -rw-r--r-- | common/services/default.nix | 1 | ||||
| -rw-r--r-- | common/services/tor.nix | 5 | ||||
| -rw-r--r-- | flake.lock | 39 | ||||
| -rw-r--r-- | flake.nix | 4 |
10 files changed, 64 insertions, 10 deletions
diff --git a/common/default.nix b/common/default.nix index b4366c2..d61b66c 100644 --- a/common/default.nix +++ b/common/default.nix @@ -6,6 +6,7 @@ nixvim, webtray, wofi-pass, + blueprint, ... }: { @@ -13,6 +14,7 @@ home-manager.nixosModules.default webtray.nixosModules.default wofi-pass.nixosModules.default + blueprint.nixosModules.default ]; fonts.packages = with pkgs; [ nerd-fonts.sauce-code-pro ]; diff --git a/common/home/default.nix b/common/home/default.nix index 928ac19..656581c 100644 --- a/common/home/default.nix +++ b/common/home/default.nix @@ -75,6 +75,9 @@ packages = [ pkgs.pv pkgs.bsnes-hd pkgs.zulu25 + pkgs.signal-export + pkgs.libsecret + pkgs.w3m ]; in { diff --git a/common/home/hyprland/default.nix b/common/home/hyprland/default.nix index 95ac423..8ddc0a4 100644 --- a/common/home/hyprland/default.nix +++ b/common/home/hyprland/default.nix @@ -141,7 +141,8 @@ }; input = { - kb_options = "caps:escape"; + kb_layout = "us,ch"; + kb_options = "caps:escape,grp:alt_space_toggle"; touchpad = { natural_scroll = true; diff --git a/common/home/programs/neomutt/default.nix b/common/home/programs/neomutt/default.nix index 1d25903..f6df8ce 100644 --- a/common/home/programs/neomutt/default.nix +++ b/common/home/programs/neomutt/default.nix @@ -2,7 +2,12 @@ { enable = true; + vimKeys = true; + extraConfig = '' + auto_view text/html + alternative_order text/plain text/html + color hdrdefault green black color quoted blue black color signature blue black diff --git a/common/home/programs/waybar/default.nix b/common/home/programs/waybar/default.nix index 6fc9c9c..75588b7 100644 --- a/common/home/programs/waybar/default.nix +++ b/common/home/programs/waybar/default.nix @@ -14,6 +14,7 @@ modules-right = [ "pulseaudio" "bluetooth" + "hyprland/language" "battery" "tray" ]; @@ -85,6 +86,12 @@ max = 100; orientation = "horizontal"; }; + + "hyprland/language" = { + format = "{}"; + format-en = "US"; + "format-de" = "CH"; + }; }; }; style = ./style.css; diff --git a/common/home/programs/waybar/style.css b/common/home/programs/waybar/style.css index 5910997..de8f3d4 100644 --- a/common/home/programs/waybar/style.css +++ b/common/home/programs/waybar/style.css @@ -7,6 +7,11 @@ window { color: #ebdbb2; } +#language { + font-size: 12px; + padding-right: 10px; +} + #pulseaudio { font-size: 12px; } diff --git a/common/services/default.nix b/common/services/default.nix index 81b9554..c65c86f 100644 --- a/common/services/default.nix +++ b/common/services/default.nix @@ -3,6 +3,7 @@ let services = [ "pipewire" "greetd" + "tor" ]; in builtins.listToAttrs ( diff --git a/common/services/tor.nix b/common/services/tor.nix new file mode 100644 index 0000000..8b41fed --- /dev/null +++ b/common/services/tor.nix @@ -0,0 +1,5 @@ +{ ... }: +{ + enable = true; + client.enable = true; +} @@ -1,5 +1,25 @@ { "nodes": { + "blueprint": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1776877923, + "narHash": "sha256-oPtbCeKEZa2r6MsxaakItcOb91vFvLakMmi27RpqlDM=", + "ref": "refs/heads/master", + "rev": "c8d79c2a149153eba15fc7729b2349199dff362f", + "revCount": 11, + "type": "git", + "url": "https://git.nathanreiner.xyz/blueprint" + }, + "original": { + "type": "git", + "url": "https://git.nathanreiner.xyz/blueprint" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -46,11 +66,11 @@ ] }, "locked": { - "lastModified": 1774559029, - "narHash": "sha256-deix7yg3j6AhjMPnFDCmWB3f83LsajaaULP5HH2j34k=", + "lastModified": 1775425411, + "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=", "owner": "nix-community", "repo": "home-manager", - "rev": "a0bb0d11514f92b639514220114ac8063c72d0a3", + "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe", "type": "github" }, "original": { @@ -90,11 +110,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1774388614, - "narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=", + "lastModified": 1776734388, + "narHash": "sha256-vl3dkhlE5gzsItuHoEMVe+DlonsK+0836LIRDnm6MXQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e", + "rev": "10e7ad5bbcb421fe07e3a4ad53a634b0cd57ffac", "type": "github" }, "original": { @@ -106,11 +126,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1774386573, - "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", + "lastModified": 1776548001, + "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", "owner": "nixos", "repo": "nixpkgs", - "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9", + "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", "type": "github" }, "original": { @@ -169,6 +189,7 @@ }, "root": { "inputs": { + "blueprint": "blueprint", "home-manager": "home-manager", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", @@ -20,6 +20,10 @@ url = "git+https://git.nathanreiner.xyz/wofi-pass"; inputs.nixpkgs.follows = "nixpkgs"; }; + blueprint = { + url = "git+https://git.nathanreiner.xyz/blueprint"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = |