diff options
| -rw-r--r-- | darwinConfigurations/mairon/default.nix | 15 | ||||
| -rw-r--r-- | flake.lock | 54 | ||||
| -rw-r--r-- | modules/common/alacritty.nix | 72 | ||||
| -rw-r--r-- | modules/common/emacs/default.nix | 2 | ||||
| -rw-r--r-- | modules/common/profiles/dev/default.nix | 1 | ||||
| -rw-r--r-- | modules/nixos/kde.nix | 5 | ||||
| -rw-r--r-- | nixosConfigurations/eonwe/default.nix | 4 | ||||
| -rw-r--r-- | nixosConfigurations/manwe/mailserver/default.nix | 2 |
8 files changed, 92 insertions, 63 deletions
diff --git a/darwinConfigurations/mairon/default.nix b/darwinConfigurations/mairon/default.nix index e031561..c989699 100644 --- a/darwinConfigurations/mairon/default.nix +++ b/darwinConfigurations/mairon/default.nix @@ -5,30 +5,37 @@ ... }: with lib; { - imports = [ - ./hidden.nix - ]; - nixfiles.modules.zathura.enable = mkForce false; hm.home.packages = with pkgs; [ cocoapods + ruby xcodes ]; homebrew = { + taps = [ + {name = "kreuzwerker/homebrew-taps";} + ]; brews = [ {name = "carthage";} + {name = "go@1.21";} + {name = "m1-terraform-provider-helper";} # kreuzwerker/homebrew-taps {name = "podman";} {name = "sourcery";} {name = "xcbeautify";} {name = "xcodegen";} ]; casks = [ + {name = "burp-suite";} + {name = "jetbrains-toolbox";} + {name = "krita";} {name = "obs";} {name = "openlens";} + {name = "podman-desktop";} {name = "shadowsocksx-ng";} {name = "vial";} + {name = "vnc-viewer";} {name = "wireshark";} ]; }; diff --git a/flake.lock b/flake.lock index 9da87d4..e3f1942 100644 --- a/flake.lock +++ b/flake.lock @@ -240,11 +240,11 @@ ] }, "locked": { - "lastModified": 1704498488, - "narHash": "sha256-yINKdShHrtjdiJhov+q0s3Y3B830ujRoSbHduUNyKag=", + "lastModified": 1704809957, + "narHash": "sha256-Z8sBeoeeY2O+BNqh5C+4Z1h1F1wQ2mij7yPZ2GY397M=", "owner": "nix-community", "repo": "home-manager", - "rev": "51e44a13acea71b36245e8bd8c7db53e0a3e61ee", + "rev": "e13aa9e287b3365473e5897e3667ea80a899cdfb", "type": "github" }, "original": { @@ -314,11 +314,11 @@ ] }, "locked": { - "lastModified": 1704590773, - "narHash": "sha256-cCsynLrSud8BwWEgf8W2/uq5gbNhFSEV4CxtkrM1Bik=", + "lastModified": 1704774121, + "narHash": "sha256-ekU4NfPIRiskQPyuSEx4TA0jm0hieW4S6GblUZe9gkQ=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "0520418311974adf427b917b972f97d92d3043c2", + "rev": "9c4f6c849b710cff6c9970fc7c19681bfa5c43af", "type": "github" }, "original": { @@ -329,11 +329,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1704632650, - "narHash": "sha256-83J/nd/NoLqo3vj0S0Ppqe8L+ijIFiGL6HNDfCCUD/Q=", + "lastModified": 1704786394, + "narHash": "sha256-aJM0ln9fMGWw1+tjyl5JZWZ3ahxAA2gw2ZpZY/hkEMs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c478b3d56969006e015e55aaece4931f3600c1b2", + "rev": "b34a6075e9e298c4124e35c3ccaf2210c1f3a43b", "type": "github" }, "original": { @@ -344,11 +344,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1704161960, - "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", + "lastModified": 1704842529, + "narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "63143ac2c9186be6d9da6035fa22620018c85932", + "rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", "type": "github" }, "original": { @@ -360,11 +360,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1704633295, - "narHash": "sha256-QYadssozKgm2xzLpBDn3Xw9PfaQudCvl9qyI19HbF2s=", + "lastModified": 1704917226, + "narHash": "sha256-81Mz54Gu49h2pA51Em0uEUMfeQTm9Etgs9a1ohqmPwo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6b045fcc3d2eb036e16b04b1127f1457eb242d7", + "rev": "3534a235f11c376779a900694008b9d1fa0be14d", "type": "github" }, "original": { @@ -376,11 +376,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1704617685, - "narHash": "sha256-E6XALyIia7tAvE2QEr9PrrD9mhw6Up45SNmE9utVfqQ=", + "lastModified": 1704916268, + "narHash": "sha256-4QqFzzV7sfUQCW/6Xkjd2ETA8ogfdZU95BhzU3txyGs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "207b14c6bd1065255e6ecffcfe0c36a7b54f8e48", + "rev": "33e57e0c38127b5140b3505deda8669fcf4ab4ea", "type": "github" }, "original": { @@ -392,11 +392,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1704290814, - "narHash": "sha256-LWvKHp7kGxk/GEtlrGYV68qIvPHkU9iToomNFGagixU=", + "lastModified": 1685801374, + "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "70bdadeb94ffc8806c0570eb5c2695ad29f0e421", + "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", "type": "github" }, "original": { @@ -455,11 +455,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1703939133, - "narHash": "sha256-Gxe+mfOT6bL7wLC/tuT2F+V+Sb44jNr8YsJ3cyIl4Mo=", + "lastModified": 1704913983, + "narHash": "sha256-K/GuHFFriQhH3VPWMhm6bYelDuPyGGjGu1OF1EWUn5k=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "9d3d7e18c6bc4473d7520200d4ddab12f8402d38", + "rev": "b0265634df1dc584585c159b775120e637afdb41", "type": "github" }, "original": { @@ -524,11 +524,11 @@ ] }, "locked": { - "lastModified": 1704590722, - "narHash": "sha256-exh2bDwYYkdJgm5wLvpWht5bRuPigk8v4Z7l4RegX3Q=", + "lastModified": 1704849611, + "narHash": "sha256-AzXnAJ5S3E2FUMPQmflYp8tsbhHBx+uK4lfKG7OKRFI=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "7d0eace387cf4fd2812d0791684f4befa0865512", + "rev": "657b4c72ffc5fef00090418bd5080f331b646a75", "type": "github" }, "original": { diff --git a/modules/common/alacritty.nix b/modules/common/alacritty.nix index 86d65eb..be3af21 100644 --- a/modules/common/alacritty.nix +++ b/modules/common/alacritty.nix @@ -19,7 +19,8 @@ in { y = size; }; dynamic_padding = false; - decorations = "full"; + decorations = "Full"; + startup_mode = "Maximized"; }; font = with config.fontScheme.monospaceFont; { normal = { @@ -41,7 +42,11 @@ in { inherit size; }; colors = with config.colourScheme; { - primary = {inherit background foreground;}; + primary = { + inherit background foreground; + dim_foreground = "None"; + bright_foreground = "None"; + }; cursor = { text = "CellBackground"; cursor = "CellForeground"; @@ -59,10 +64,6 @@ in { foreground = red; background = black; }; - footer_bar = { - foreground = black; - background = white; - }; }; hints = { start = { @@ -73,33 +74,52 @@ in { foreground = yellow; background = black; }; - selection = { - text = "CellBackground"; - background = "CellForeground"; - }; - normal = { - inherit black red green yellow blue magenta cyan white; - }; - bright = { - inherit - brightBlack - brightRed - brightGreen - brightYellow - brightBlue - brightMagenta - brightCyan - brightWhite - ; - }; + }; + line_indicator = { + foreground = "None"; + background = "None"; + }; + footer_bar = { + foreground = black; + background = white; + }; + selection = { + text = "CellBackground"; + background = "CellForeground"; + }; + normal = { + inherit + black + red + green + yellow + blue + magenta + cyan + white + ; + }; + bright = { + black = brightBlack; + red = brightRed; + green = brightGreen; + yellow = brightYellow; + blue = brightBlue; + magenta = brightMagenta; + cyan = brightCyan; + white = brightWhite; }; }; + selection.save_to_clipboard = true; cursor = { style = { shape = "Block"; + blinking = "On"; + }; + vi_mode_style = { + shape = "Block"; blinking = "Off"; }; - vi_mode_style = "Block"; }; }; }; diff --git a/modules/common/emacs/default.nix b/modules/common/emacs/default.nix index 7cd06e0..d16d168 100644 --- a/modules/common/emacs/default.nix +++ b/modules/common/emacs/default.nix @@ -133,7 +133,7 @@ in { texlab # lang (tex +lsp) texlive.combined.scheme-full # :lang org tex unzip # :tools debugger - wordnet # :tools (lookup +dictionary +offline) + # wordnet # :tools (lookup +dictionary +offline) yaml-language-server # :lang (yaml +lsp) zig # :lang zig :editor format zls # :lang (zig +lsp) diff --git a/modules/common/profiles/dev/default.nix b/modules/common/profiles/dev/default.nix index ecd586a..8c9e400 100644 --- a/modules/common/profiles/dev/default.nix +++ b/modules/common/profiles/dev/default.nix @@ -9,6 +9,7 @@ with lib; let in { imports = [ ./containers.nix + ./hidden.nix ./sql.nix ]; diff --git a/modules/nixos/kde.nix b/modules/nixos/kde.nix index adec490..a7b2c19 100644 --- a/modules/nixos/kde.nix +++ b/modules/nixos/kde.nix @@ -24,6 +24,11 @@ in { "widget.use-xdg-desktop-portal.file-picker" = 1; "widget.use-xdg-desktop-portal.mime-handler" = 1; }; + + services.kdeconnect = { + enable = true; + indicator = true; + }; }; services.xserver = { diff --git a/nixosConfigurations/eonwe/default.nix b/nixosConfigurations/eonwe/default.nix index 8e10af9..387c51a 100644 --- a/nixosConfigurations/eonwe/default.nix +++ b/nixosConfigurations/eonwe/default.nix @@ -5,10 +5,6 @@ ... }: with lib; { - imports = [ - ./hidden.nix - ]; - nixfiles.modules = { ark.enable = true; diff --git a/nixosConfigurations/manwe/mailserver/default.nix b/nixosConfigurations/manwe/mailserver/default.nix index cb6b3dd..ce32f5e 100644 --- a/nixosConfigurations/manwe/mailserver/default.nix +++ b/nixosConfigurations/manwe/mailserver/default.nix @@ -81,7 +81,7 @@ with lib; { # Just a list of accounts with aliases and hasedPasswords. Not necessarily # secret, but kept from prying eyes. - loginAccounts = import ./accounts.nix lib; + loginAccounts = import ./hidden.nix lib; }; # https://gitlab.com/simple-nixos-mailserver/nixos-mailserver/-/issues/241 |