From f6a89cba086464cc231862c62aced088b46fca5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sat, 30 Nov 2024 18:42:54 +0000 Subject: [PATCH] nix: update to 24.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-on: https://codeberg.org/leana8959/.files/pulls/1 Co-authored-by: Léana 江 Co-committed-by: Léana 江 --- .config/xmobar/xmobarrc | 39 ----- .config/xmonad/xmonad.hs | 14 +- flake.lock | 36 ++-- flake.nix | 6 +- nix/configurations/default.nix | 25 +-- nix/homeModules/common/auto-gc.nix | 13 ++ nix/homeModules/common/cmus/default.nix | 104 ++++++------ nix/homeModules/common/direnv.nix | 12 +- nix/homeModules/common/fcitx5/default.nix | 21 +++ .../fcitx5/fcitx/conf/classicui.conf | 0 .../{extra => common}/fcitx5/fcitx/config | 0 .../{extra => common}/fcitx5/fcitx/profile | 0 .../fcitx5/fcitx/table/cangjie3.conf | 0 nix/homeModules/{extra => common}/feh.nix | 1 - nix/homeModules/common/firefox.nix | 90 ++++++++++ nix/homeModules/common/fish/aliasesAbbrs.nix | 12 +- nix/homeModules/common/fish/default.nix | 27 ++- nix/homeModules/common/fzf.nix | 25 ++- nix/homeModules/common/gpg.nix | 16 +- nix/homeModules/common/kitty.nix | 16 +- nix/homeModules/common/locale.nix | 10 ++ nix/homeModules/common/neovim.nix | 48 +++--- nix/homeModules/common/packages.nix | 9 +- nix/homeModules/{extra => common}/sioyek.nix | 2 +- nix/homeModules/common/starship/default.nix | 13 +- nix/homeModules/common/user-nixconf.nix | 9 +- nix/homeModules/common/wired/default.nix | 27 +++ .../homeModules/common}/wired/wired.ron | 0 nix/homeModules/common/xmobar.nix | 43 +++++ nix/homeModules/extra/auto-gc.nix | 7 - nix/homeModules/extra/fcitx5/default.nix | 13 -- .../extra/neovim-moreLangServers.nix | 2 +- nix/homeModules/extra/preset-nix.nix | 6 + nix/homeModules/extra/preset-utilities.nix | 2 - nix/homeModules/named/bismuth/default.nix | 2 +- nix/homeModules/named/carbon/browser.nix | 158 ------------------ nix/homeModules/named/carbon/default.nix | 27 ++- nix/homeModules/named/carbon/dev.nix | 39 +++-- nix/homeModules/named/carbon/firefox.nix | 44 +++++ nix/homeModules/named/carbon/gui.nix | 60 +++++++ nix/homeModules/named/carbon/wm.nix | 89 ---------- nix/nixosModules/common/zram.nix | 5 + nix/nixosModules/extra/tmp-tmpfs.nix | 2 + nix/nixosModules/extra/zram.nix | 1 - nix/nixosModules/named/carbon/audio.nix | 13 +- nix/nixosModules/named/carbon/battery.nix | 30 ---- nix/nixosModules/named/carbon/bluetooth.nix | 15 -- .../named/carbon/connectivity.nix | 69 ++++++++ nix/nixosModules/named/carbon/default.nix | 13 +- nix/nixosModules/named/carbon/gui.nix | 37 ++-- nix/nixosModules/named/carbon/input.nix | 22 +++ nix/nixosModules/named/carbon/networking.nix | 53 ------ nix/nixosModules/named/carbon/packages.nix | 22 +-- nix/nixosModules/named/carbon/scanner.nix | 8 - nix/nixosModules/shared/system-nixconf.nix | 5 +- nix/overlays/default.nix | 4 + nix/packages/default.nix | 12 +- nix/packages/fish-lsp/default.nix | 51 ------ nix/pre-commit/default.nix | 3 +- nix/secrets/wpa_password.age | 26 +-- 60 files changed, 701 insertions(+), 757 deletions(-) delete mode 100644 .config/xmobar/xmobarrc create mode 100644 nix/homeModules/common/auto-gc.nix create mode 100644 nix/homeModules/common/fcitx5/default.nix rename nix/homeModules/{extra => common}/fcitx5/fcitx/conf/classicui.conf (100%) rename nix/homeModules/{extra => common}/fcitx5/fcitx/config (100%) rename nix/homeModules/{extra => common}/fcitx5/fcitx/profile (100%) rename nix/homeModules/{extra => common}/fcitx5/fcitx/table/cangjie3.conf (100%) rename nix/homeModules/{extra => common}/feh.nix (95%) create mode 100644 nix/homeModules/common/firefox.nix create mode 100644 nix/homeModules/common/locale.nix rename nix/homeModules/{extra => common}/sioyek.nix (94%) create mode 100644 nix/homeModules/common/wired/default.nix rename {.config => nix/homeModules/common}/wired/wired.ron (100%) create mode 100644 nix/homeModules/common/xmobar.nix delete mode 100644 nix/homeModules/extra/auto-gc.nix delete mode 100644 nix/homeModules/extra/fcitx5/default.nix delete mode 100644 nix/homeModules/named/carbon/browser.nix create mode 100644 nix/homeModules/named/carbon/firefox.nix create mode 100644 nix/homeModules/named/carbon/gui.nix delete mode 100644 nix/homeModules/named/carbon/wm.nix create mode 100644 nix/nixosModules/common/zram.nix delete mode 100644 nix/nixosModules/extra/zram.nix delete mode 100644 nix/nixosModules/named/carbon/bluetooth.nix create mode 100644 nix/nixosModules/named/carbon/connectivity.nix create mode 100644 nix/nixosModules/named/carbon/input.nix delete mode 100644 nix/nixosModules/named/carbon/networking.nix delete mode 100644 nix/nixosModules/named/carbon/scanner.nix delete mode 100644 nix/packages/fish-lsp/default.nix diff --git a/.config/xmobar/xmobarrc b/.config/xmobar/xmobarrc deleted file mode 100644 index fc52174b..00000000 --- a/.config/xmobar/xmobarrc +++ /dev/null @@ -1,39 +0,0 @@ --- vim:et:sw=2:ts=2:ft=haskell - -Config { overrideRedirect = False - , font = "Iosevka 11" - , additionalFonts = [ "Noto Color Emoji 9" - ] - , bgColor = "#000000" - , fgColor = "#FFFFFF" - , position = Bottom - , commands = [ Run Kbd - [ ("myDvorakFrench", "🇫🇷") - , ("myDvorak", "🇺🇸") - , ("us", "🇹🇼") - ] - , Run ThermalZone 0 ["-t", "󰔏 °C"] 30 - , Run Alsa "default" "Master" - [ "-t", " %" - , "--" - , "-O", "󰕾" - , "-o", "󰖁" - ] - , Run Memory [ "-t", "󰍛 %" ] 30 - , Run Date "%a %d %H:%M:%S" "date" 10 - , Run Battery - [ "-t", ":%" - , "--" - , "-O", "󰂄" - , "-i", "󱟦" - , "-o", "󰁾" - , "-h", "green" - , "-m", "yell" - , "-l", "red" - ] 10 - , Run XMonadLog - ] - , sepChar = "%" - , alignSep = "}{" - , template = "%XMonadLog% }{ %kbd% | %alsa:default:Master% | %thermal0% | %memory% | %battery% | %date% " - } diff --git a/.config/xmonad/xmonad.hs b/.config/xmonad/xmonad.hs index d259ce1f..f7214708 100644 --- a/.config/xmonad/xmonad.hs +++ b/.config/xmonad/xmonad.hs @@ -133,8 +133,8 @@ myUnmaps = myKeymaps = [ -- Display - ((0, xF86XK_MonBrightnessDown ), spawn "light -U 5" ) - , ((0, xF86XK_MonBrightnessUp ), spawn "light -A 5" ) + ((0, xF86XK_MonBrightnessDown), spawn "light -U 5" ) + , ((0, xF86XK_MonBrightnessUp ), spawn "light -A 5" ) , ((controlMask, xF86XK_MonBrightnessDown), spawn "xbrightness DP-2-2 -0.1") , ((controlMask, xF86XK_MonBrightnessUp ), spawn "xbrightness DP-2-2 +0.1") @@ -160,8 +160,8 @@ myKeymaps = , ((superMask .|. shiftMask, xK_period), sendMessage Expand) -- Increment / decrement the number of windows in the master area - , ((superMask ,xK_comma ), sendMessage (IncMasterN -1)) - , ((superMask ,xK_period), sendMessage (IncMasterN 1)) + , ((superMask, xK_comma ), sendMessage (IncMasterN -1)) + , ((superMask, xK_period), sendMessage (IncMasterN 1)) -- sink , ((superMask .|. shiftMask, xK_s), withFocused $ windows . W.sink) @@ -185,10 +185,12 @@ myKeymaps = , ((controlMask .|. altMask, xK_p), namedScratchpadAction myScratchpads "pass" ) , ((controlMask .|. altMask, xK_r), namedScratchpadAction myScratchpads "ranger") , ((superMask, xK_o), spawn launchDmenu ) + , ((superMask, xK_l), spawn lock ) ] where launchFirefox = "if type firefox; then firefox; else firefox-esr; fi" launchDmenu = "dmenu_run -i -fn \"Iosevka Extended-17\" -nb \"#36363a\" -nf \"#e2e2e4\" -sb \"#f7f7f8\" -sf \"#36363a\" -l 10" + lock = "xscreensaver-command -lock" yeetingBindings = gotoWorkspace @@ -246,8 +248,8 @@ myStartupHook = do spawn "feh --no-fehbg --bg-fill ~/.wallpaper &" -- wallpaper xmobarOf :: ScreenId -> IO StatusBarConfig -xmobarOf 0 = pure $ statusBarProp "xmobar -x 0 ~/.config/xmobar/xmobarrc" (pure myPrettyPrinter) -xmobarOf 1 = pure $ statusBarProp "xmobar -x 1 ~/.config/xmobar/xmobarrc" (pure myPrettyPrinter) +xmobarOf 0 = pure $ statusBarProp "xmobar -x 0" (pure myPrettyPrinter) +xmobarOf 1 = pure $ statusBarProp "xmobar -x 1" (pure myPrettyPrinter) xmobarOf _ = mempty -- Note: `xmonad --restart` will make Firefox's fullscreen work duck the xmobar stop working diff --git a/flake.lock b/flake.lock index fc9db7f8..30975f92 100644 --- a/flake.lock +++ b/flake.lock @@ -232,16 +232,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1732466619, + "narHash": "sha256-T1e5oceypZu3Q8vzICjv1X/sGs9XfJRMW5OuXHgpB3c=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "f3111f62a23451114433888902a55cf0692b408d", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -322,32 +322,32 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1717144377, - "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "lastModified": 1732824227, + "narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1732824227, + "narHash": "sha256-fYNXgpu1AEeLyd3fQt4Ym0tcVP7cdJ8wRoqJ+CtTRyY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "c71ad5c34d51dcbda4c15f44ea4e4aa6bb6ac1e9", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -386,11 +386,11 @@ }, "nur": { "locked": { - "lastModified": 1731872711, - "narHash": "sha256-2vj0E55Ckfo8eiPqImADvBEHwtIoOx8ufiRnXElQf0w=", + "lastModified": 1732965400, + "narHash": "sha256-sd70kImYBHhPm2carweV0MjkswAcDaH4f0n6lFvde9A=", "owner": "nix-community", "repo": "nur", - "rev": "25e6cfc7d6260864f5f5dfe2617b39a6afb6ea5e", + "rev": "5564914011ac9ef3309b94aabc40ae0502e64206", "type": "github" }, "original": { @@ -411,11 +411,11 @@ ] }, "locked": { - "lastModified": 1731363552, - "narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", + "lastModified": 1732021966, + "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", + "rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 35e06376..c32b1740 100644 --- a/flake.nix +++ b/flake.nix @@ -43,12 +43,12 @@ }; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11"; home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/release-24.11"; inputs."nixpkgs".follows = "nixpkgs"; }; diff --git a/nix/configurations/default.nix b/nix/configurations/default.nix index 308472e5..e2b3270c 100644 --- a/nix/configurations/default.nix +++ b/nix/configurations/default.nix @@ -142,25 +142,16 @@ in inputs.disko.nixosModules.default self.diskoConfigurations.carbon self.nixosModules.tmp-tmpfs - self.nixosModules.zram { - home-manager.users.leana = { - imports = [ - self.homeModules.fcitx5 - self.homeModules.sioyek - self.homeModules.feh - - self.homeModules.preset-utilities - self.homeModules.preset-scripting - self.homeModules.preset-fancy - self.homeModules.preset-nix - self.homeModules.preset-workflow + home-manager.users.leana.imports = [ + self.homeModules.preset-utilities + self.homeModules.preset-scripting + self.homeModules.preset-fancy + self.homeModules.preset-nix + self.homeModules.preset-workflow - self.homeModules.neovim-moreLangServers - ]; - programs.git.signing.signByDefault = true; - programs.cmus.enable = true; - }; + self.homeModules.neovim-moreLangServers + ]; } ]; }; diff --git a/nix/homeModules/common/auto-gc.nix b/nix/homeModules/common/auto-gc.nix new file mode 100644 index 00000000..6298ee77 --- /dev/null +++ b/nix/homeModules/common/auto-gc.nix @@ -0,0 +1,13 @@ +{ + nixosConfig ? null, + lib, + ... +}: + +{ + nix.gc = lib.mkIf (!nixosConfig.nix.gc.automatic or false) { + automatic = true; + frequency = "weekly"; + options = "--delete-older-than 15d"; + }; +} diff --git a/nix/homeModules/common/cmus/default.nix b/nix/homeModules/common/cmus/default.nix index 1b2e2378..7390c86a 100644 --- a/nix/homeModules/common/cmus/default.nix +++ b/nix/homeModules/common/cmus/default.nix @@ -1,59 +1,49 @@ +{ pkgs, lib, ... }: + { - pkgs, - lib, - config, - ... -}: -{ - options.programs.cmus.enable = lib.mkEnableOption "cmus"; - - config = lib.mkIf config.programs.cmus.enable { - home.packages = [ pkgs.cmus ]; - xdg.configFile."cmus/rc".text = lib.mkMerge [ - (builtins.readFile ./rc) - - (lib.mkIf pkgs.stdenv.isLinux ( - let - # dispatch to multiple callbacks - callback = pkgs.writeShellApplication { - name = "cmus-callback-script"; - runtimeInputs = [ - pkgs.cmusfm - pkgs.libnotify - ]; - text = '' - argv=("$@") - declare -A map - while [ $# -gt 0 ]; do - map["$1"]="$2" - shift - shift - done - - notify-send "''${map[title]}" "''${map[artist]} / ''${map[album]}" - cmusfm "''${argv[@]}" - ''; - }; - in - '' - set status_display_program=${lib.getExe callback} - '' - )) - - (lib.mkIf pkgs.stdenv.isDarwin '' - set status_display_program=${lib.getExe pkgs.cmusfm} - '') - - (lib.mkIf pkgs.stdenv.isLinux '' - set output_plugin=alsa - '') - - # When switching over bluetooth, toggle the output device to coreaudio - # and back to ao would fix the no sound issue. - (lib.mkIf pkgs.stdenv.isDarwin '' - # distortion fix https://github.com/cmus/cmus/issues/1130#issuecomment-1003324193 - set output_plugin=ao - '') - ]; - }; + + programs.cmus.extraConfig = + let + # dispatch to multiple callbacks + callback-script = pkgs.writeShellApplication { + name = "cmus-callback-script"; + runtimeInputs = [ + pkgs.cmusfm + pkgs.libnotify + ]; + text = '' + argv=("$@") + declare -A map + while [ $# -gt 0 ]; do + map["$1"]="$2" + shift + shift + done + + notify-send "''${map[title]}" "''${map[artist]} / ''${map[album]}" + cmusfm "''${argv[@]}" + ''; + }; + in + (builtins.readFile ./rc) + + + (lib.optionalString pkgs.stdenv.isLinux '' + set status_display_program=${lib.getExe callback-script} + '') + + + (lib.optionalString pkgs.stdenv.isDarwin '' + set status_display_program=${lib.getExe pkgs.cmusfm} + '') + + + (lib.optionalString pkgs.stdenv.isLinux '' + set output_plugin=alsa + '') + + # When switching over bluetooth, toggle the output device to coreaudio + # and back to ao would fix the no sound issue. + + (lib.optionalString pkgs.stdenv.isDarwin '' + # distortion fix https://github.com/cmus/cmus/issues/1130#issuecomment-1003324193 + set output_plugin=ao + ''); + } diff --git a/nix/homeModules/common/direnv.nix b/nix/homeModules/common/direnv.nix index 329ffc89..38fa31ac 100644 --- a/nix/homeModules/common/direnv.nix +++ b/nix/homeModules/common/direnv.nix @@ -1,13 +1,13 @@ { config, ... }: { + programs.direnv = { nix-direnv.enable = true; - config = builtins.fromTOML '' - [whitelist] - prefix = [ "${config.home.homeDirectory}/.dotfiles" ] - [global] - strict_env = true - ''; + config = { + whitelist.prefix = [ "${config.home.homeDirectory}/.dotfiles" ]; + global.strict_env = true; + }; }; + } diff --git a/nix/homeModules/common/fcitx5/default.nix b/nix/homeModules/common/fcitx5/default.nix new file mode 100644 index 00000000..0ff916af --- /dev/null +++ b/nix/homeModules/common/fcitx5/default.nix @@ -0,0 +1,21 @@ +{ + pkgs, + config, + lib, + ... +}: + +{ + + i18n.inputMethod = { + fcitx5.addons = [ + pkgs.fcitx5-chinese-addons + pkgs.fcitx5-table-extra + ]; + }; + + xdg.configFile = lib.mkIf (config.i18n.inputMethod.enabled != null) { + "fcitx5".source = ./fcitx; + }; + +} diff --git a/nix/homeModules/extra/fcitx5/fcitx/conf/classicui.conf b/nix/homeModules/common/fcitx5/fcitx/conf/classicui.conf similarity index 100% rename from nix/homeModules/extra/fcitx5/fcitx/conf/classicui.conf rename to nix/homeModules/common/fcitx5/fcitx/conf/classicui.conf diff --git a/nix/homeModules/extra/fcitx5/fcitx/config b/nix/homeModules/common/fcitx5/fcitx/config similarity index 100% rename from nix/homeModules/extra/fcitx5/fcitx/config rename to nix/homeModules/common/fcitx5/fcitx/config diff --git a/nix/homeModules/extra/fcitx5/fcitx/profile b/nix/homeModules/common/fcitx5/fcitx/profile similarity index 100% rename from nix/homeModules/extra/fcitx5/fcitx/profile rename to nix/homeModules/common/fcitx5/fcitx/profile diff --git a/nix/homeModules/extra/fcitx5/fcitx/table/cangjie3.conf b/nix/homeModules/common/fcitx5/fcitx/table/cangjie3.conf similarity index 100% rename from nix/homeModules/extra/fcitx5/fcitx/table/cangjie3.conf rename to nix/homeModules/common/fcitx5/fcitx/table/cangjie3.conf diff --git a/nix/homeModules/extra/feh.nix b/nix/homeModules/common/feh.nix similarity index 95% rename from nix/homeModules/extra/feh.nix rename to nix/homeModules/common/feh.nix index f006f00a..2c157306 100644 --- a/nix/homeModules/extra/feh.nix +++ b/nix/homeModules/common/feh.nix @@ -1,7 +1,6 @@ { programs.feh = { - enable = true; keybindings = { prev_img = [ "Left" diff --git a/nix/homeModules/common/firefox.nix b/nix/homeModules/common/firefox.nix new file mode 100644 index 00000000..d71a5ce8 --- /dev/null +++ b/nix/homeModules/common/firefox.nix @@ -0,0 +1,90 @@ +{ pkgs, ... }: + +let + inherit (pkgs) nur; +in + +{ + home.packages = [ + pkgs.cascadia-code # Used in tab bar + ]; + + programs.firefox = { + + # some options only works with firefox-esr + package = pkgs.firefox-esr; + + # https://mozilla.github.io/policy-templates + policies = { + HardwareAcceleration = true; + DisableFirefoxScreenshots = true; + DisablePocket = true; + DisplayMenuBar = "never"; + DisplayBookmarksToolbar = "never"; + NoDefaultBookmarks = true; + OfferToSaveLogins = false; + OfferToSaveLoginsDefault = false; + PasswordManagerEnabled = false; + FirefoxHome = { + Search = true; + TopSites = true; + SponsoredTopSites = false; + Highlights = false; + Pocket = false; + SponsoredPocket = false; + }; + UserMessaging = { + ExtensionRecommendations = false; + SkipOnboarding = true; + }; + DNSOverHTTPS = { + Enabled = true; + }; + EnableTrackingProtection = { + Value = true; + Cryptomining = true; + Fingerprinting = true; + }; + }; + + profiles.leana = { + + userChrome = + let + onebar = pkgs.fetchFromGitea { + domain = "git.gay"; + owner = "freeplay"; + repo = "Firefox-Onebar"; + rev = "197a5e5298985be3767da504bac153f3b75b63f7"; + hash = "sha256-+AG6dp92//zEROtKQgPPB0YCTGtHywM8AtobvguF1PM="; + }; + in + '' + #statuspanel-label { + font-size: 18px !important; + font-family: "Cascadia Code" !important; + } + .urlbar-input-box { + font-size: 18px !important; + font-family: "Cascadia Code" !important; + } + + ${builtins.readFile "${onebar}/onebar.css"} + ''; + + extensions = + let + addons = nur.repos.rycee.firefox-addons; + in + [ + addons.ublock-origin + addons.privacy-badger + addons.tridactyl + addons.languagetool + addons.news-feed-eradicator + ]; + + }; + + }; +} diff --git a/nix/homeModules/common/fish/aliasesAbbrs.nix b/nix/homeModules/common/fish/aliasesAbbrs.nix index 5370c241..8597e103 100644 --- a/nix/homeModules/common/fish/aliasesAbbrs.nix +++ b/nix/homeModules/common/fish/aliasesAbbrs.nix @@ -6,7 +6,7 @@ }: { programs.fish = { - shellAbbrs = lib.mkMerge [ + shellAbbrs = lib.mergeAttrsList [ { # Docker dc = "docker compose"; @@ -22,7 +22,7 @@ ":q" = "exit"; } - (lib.mkIf pkgs.stdenv.isLinux { + (lib.optionalAttrs pkgs.stdenv.isLinux { ssys = "sudo systemctl"; sys = "systemctl"; se = "SUDO_EDITOR=(which \$EDITOR) sudoedit"; @@ -30,25 +30,25 @@ hswitch = "home-manager switch --flake ~/.dotfiles#${hostname}"; }) - (lib.mkIf pkgs.stdenv.isDarwin { + (lib.optionalAttrs pkgs.stdenv.isDarwin { nswitch = "darwin-rebuild switch -L --flake ~/.dotfiles#${hostname} --option sandbox false"; }) ]; - shellAliases = lib.mkMerge [ + shellAliases = lib.mergeAttrsList [ { rm = "rm -I"; # idiot protection tree = "tree -Cph"; restow = "cd ~/.dotfiles/ && stow -D . && stow -S . && prevd"; } - (lib.mkIf pkgs.stdenv.isLinux { + (lib.optionalAttrs pkgs.stdenv.isLinux { # idiot protection chmod = "chmod --preserve-root"; chown = "chown --preserve-root"; }) - (lib.mkIf pkgs.stdenv.isDarwin ( + (lib.optionalAttrs pkgs.stdenv.isDarwin ( let cmds = builtins.concatStringsSep ";"; in diff --git a/nix/homeModules/common/fish/default.nix b/nix/homeModules/common/fish/default.nix index 687bd737..fd7aca45 100644 --- a/nix/homeModules/common/fish/default.nix +++ b/nix/homeModules/common/fish/default.nix @@ -4,6 +4,11 @@ pkgs, ... }: + +let + inherit (pkgs) myPkgs; +in + { imports = [ ./aliasesAbbrs.nix @@ -18,14 +23,27 @@ home.packages = [ pkgs.vivid - pkgs.myPkgs.hutils + myPkgs.hutils ]; programs = { fd.enable = true; - fzf.enable = true; tmux.enable = true; + fzf = { + enable = true; + enableFishIntegration = true; + }; + starship = { + enable = true; + enableFishIntegration = true; + }; + kitty = { + settings.shell = ''${pkgs.fish}/bin/fish --command="tmux-home" --login''; + shellIntegration.enableFishIntegration = true; + }; }; + services.gpg-agent.enableFishIntegration = true; + xdg.configFile = lib.mapAttrs' (path: _: { name = "fish/functions/${path}"; value.source = lib.path.append ./functions path; @@ -33,7 +51,7 @@ programs.fish = { - sourcePaths = lib.mkMerge [ + sourcePaths = [ # Make sure wrapper comes first # https://discourse.nixos.org/t/sudo-run-current-system-sw-bin-sudo-must-be-owned-by-uid-0-and-have-the-setuid-bit-set-and-cannot-chdir-var-cron-bailing-out-var-cron-permission-denied/20463/2 @@ -53,8 +71,7 @@ ] # Add brew, but as fallback - (lib.mkIf pkgs.stdenv.isDarwin "/opt/homebrew/bin") - ]; + ++ (lib.optional pkgs.stdenv.isDarwin "/opt/homebrew/bin"); interactiveShellInit = builtins.readFile ./shellInit.fish; diff --git a/nix/homeModules/common/fzf.nix b/nix/homeModules/common/fzf.nix index 3b18e08e..bbdcfe53 100644 --- a/nix/homeModules/common/fzf.nix +++ b/nix/homeModules/common/fzf.nix @@ -1,15 +1,14 @@ { - programs.fzf = { - enableFishIntegration = true; - defaultOptions = [ - "--cycle" - "--border=none" - "--preview-window=wrap" - "--color=fg:#000000,bg:#eeeeee,hl:#ca1243" - "--color=fg+:#000000,bg+:#d0d0d0,hl+:#ca1243" - "--color=info:#0184bc,prompt:#645199,pointer:#645199" - "--color=marker:#0184bc,spinner:#645199,header:#645199" - "--color=gutter:#eeeeee" - ]; - }; + + programs.fzf.defaultOptions = [ + "--cycle" + "--border=none" + "--preview-window=wrap" + "--color=fg:#000000,bg:#eeeeee,hl:#ca1243" + "--color=fg+:#000000,bg+:#d0d0d0,hl+:#ca1243" + "--color=info:#0184bc,prompt:#645199,pointer:#645199" + "--color=marker:#0184bc,spinner:#645199,header:#645199" + "--color=gutter:#eeeeee" + ]; + } diff --git a/nix/homeModules/common/gpg.nix b/nix/homeModules/common/gpg.nix index 2f4b8c32..0773668c 100644 --- a/nix/homeModules/common/gpg.nix +++ b/nix/homeModules/common/gpg.nix @@ -2,7 +2,6 @@ { services = { - gpg-agent.enableFishIntegration = true; gpg-agent.defaultCacheTtl = 1209600; gpg-agent.pinentryPackage = pkgs.pinentry-tty; }; @@ -38,7 +37,6 @@ # istic { - text = '' -----BEGIN PGP PUBLIC KEY BLOCK----- @@ -47,15 +45,15 @@ Z0BldHVkaWFudC51bml2LXJlbm5lczEuZnI+iJMEExYKADsWIQTrVEpkQrO2zojN hZcyA125fnd+6wUCY/CoXQIbAwULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgAAK CRAyA125fnd+69LtAP4+CUIJEPUMlsQIxeR7D0P36Gc99H2CetbFnvuwbjx+6AD+ - NUpPeodNBF9bkehOXXVeozYsl9KVdnrUDi/k6PpVTQK4OARj8KhdEgorBgEEAZdV - AQUBAQdAoxVYfP8bPtJmzdEjZqeAz3c5xfb3i2WXgjgzSCddBFMDAQgHiHgEGBYK - ACAWIQTrVEpkQrO2zojNhZcyA125fnd+6wUCY/CoXQIbDAAKCRAyA125fnd+697N - AP0TUgyl0CS5SLNYMXQsfmv+mQMduFHD3k2dFEuto3mEOwEAie95uXDRFHaV/LMv - TRwwyv2P9C8usDGCDj1e+h8PtAI= - =MmSo + NUpPeodNBF9bkehOXXVeozYsl9KVdnrUDi/k6PpVTQK0REzDqWFuYSBDSElBTkcg + KGdpdGxhYjIuaXN0aWMpIDxsZWFuYS5jaGlhbmdAZXR1ZGlhbnQudW5pdi1yZW5u + ZXMuZnI+iI4EExYKADYWIQTrVEpkQrO2zojNhZcyA125fnd+6wUCZz+qdAIbAwQL + CQgHBBUKCQgFFgIDAQACHgUCF4AACgkQMgNduX53fusnZwEAoq33+pdQlBnzU5HG + 3vmaJSHNtgYzIAiLpkU7ahufgM0A/0FKGNFTPnamSEOui4lANJvSZumv4QkVRVmB + Q+D9ElYO + =gs3q -----END PGP PUBLIC KEY BLOCK----- ''; - trust = 5; } ]; diff --git a/nix/homeModules/common/kitty.nix b/nix/homeModules/common/kitty.nix index 6c554885..c2785175 100644 --- a/nix/homeModules/common/kitty.nix +++ b/nix/homeModules/common/kitty.nix @@ -1,11 +1,11 @@ +{ lib, config, ... }: + +let + cfg = config.programs.kitty; +in + { - pkgs, - lib, - config, - ... -}: -{ - programs.kitty = lib.mkIf config.programs.kitty.enable { + programs.kitty = lib.mkIf cfg.enable { font = { name = "AltiosevkaNFM"; size = 14; @@ -15,7 +15,6 @@ background = "#ffffff"; confirm_os_window_close = 0; text_composition_strategy = "1.7 0"; - shell = ''${pkgs.fish}/bin/fish --command="tmux-home" --login''; }; extraConfig = '' background #f8f8f8 @@ -40,6 +39,5 @@ color15 #ffffff selection_foreground #f8f8f8 ''; - shellIntegration.enableFishIntegration = true; }; } diff --git a/nix/homeModules/common/locale.nix b/nix/homeModules/common/locale.nix new file mode 100644 index 00000000..fbd0285a --- /dev/null +++ b/nix/homeModules/common/locale.nix @@ -0,0 +1,10 @@ +{ + nixosConfig ? null, + ... +}: + +{ + home.language = { + base = nixosConfig.i18n.defaultLocale or "en_US.UTF-8"; + }; +} diff --git a/nix/homeModules/common/neovim.nix b/nix/homeModules/common/neovim.nix index b6e39677..cc91d7fa 100644 --- a/nix/homeModules/common/neovim.nix +++ b/nix/homeModules/common/neovim.nix @@ -6,31 +6,29 @@ }: { - config = { - programs.neovim = { - defaultEditor = true; - extraPackages = [ - # might be useful for servers, serves as minimal configuration - pkgs.nodePackages.bash-language-server - pkgs.shellcheck - pkgs.shfmt - ]; - }; + programs.neovim = { + defaultEditor = true; + extraPackages = [ + # might be useful for servers, serves as minimal configuration + pkgs.nodePackages.bash-language-server + pkgs.shellcheck + pkgs.shfmt + ]; + }; - xdg.configFile = - let - fr_utf-8_spl = builtins.fetchurl { - url = "http://ftp.vim.org/vim/runtime/spell/fr.utf-8.spl"; - sha256 = "abfb9702b98d887c175ace58f1ab39733dc08d03b674d914f56344ef86e63b61"; - }; - fr_utf-8_sug = builtins.fetchurl { - url = "http://ftp.vim.org/vim/runtime/spell/fr.utf-8.sug"; - sha256 = "0294bc32b42c90bbb286a89e23ca3773b7ef50eff1ab523b1513d6a25c6b3f58"; - }; - in - lib.mkIf config.programs.neovim.enable { - "nvim/spell/fr.utf-8.spl".source = fr_utf-8_spl; - "nvim/spell/fr.utf-8.sug".source = fr_utf-8_sug; + xdg.configFile = + let + fr_utf-8_spl = builtins.fetchurl { + url = "http://ftp.vim.org/vim/runtime/spell/fr.utf-8.spl"; + sha256 = "abfb9702b98d887c175ace58f1ab39733dc08d03b674d914f56344ef86e63b61"; }; - }; + fr_utf-8_sug = builtins.fetchurl { + url = "http://ftp.vim.org/vim/runtime/spell/fr.utf-8.sug"; + sha256 = "0294bc32b42c90bbb286a89e23ca3773b7ef50eff1ab523b1513d6a25c6b3f58"; + }; + in + lib.mkIf config.programs.neovim.enable { + "nvim/spell/fr.utf-8.spl".source = fr_utf-8_spl; + "nvim/spell/fr.utf-8.sug".source = fr_utf-8_sug; + }; } diff --git a/nix/homeModules/common/packages.nix b/nix/homeModules/common/packages.nix index c1b23b31..4a36dfc1 100644 --- a/nix/homeModules/common/packages.nix +++ b/nix/homeModules/common/packages.nix @@ -6,11 +6,13 @@ fish.enable = true; git.enable = true; vim.enable = true; + starship.enable = true; + tmux.enable = true; }; - services.gpg-agent.enable = lib.mkIf pkgs.stdenv.isLinux true; + services.gpg-agent.enable = lib.mkDefault pkgs.stdenv.isLinux; - home.packages = lib.mkMerge [ + home.packages = [ pkgs.file pkgs.gnused @@ -19,7 +21,6 @@ ] # coreutils for darwin - (lib.mkIf pkgs.stdenv.isDarwin [ pkgs.uutils-coreutils-noprefix ]) - ]; + ++ (lib.optional pkgs.stdenv.isDarwin pkgs.uutils-coreutils-noprefix); } diff --git a/nix/homeModules/extra/sioyek.nix b/nix/homeModules/common/sioyek.nix similarity index 94% rename from nix/homeModules/extra/sioyek.nix rename to nix/homeModules/common/sioyek.nix index 39a45b7a..ec4cce65 100644 --- a/nix/homeModules/extra/sioyek.nix +++ b/nix/homeModules/common/sioyek.nix @@ -2,7 +2,6 @@ programs.sioyek = { - enable = true; bindings = { "move_up" = "k"; "move_down" = "j"; @@ -17,6 +16,7 @@ "" ]; }; + config.should_launch_new_window = "1"; }; diff --git a/nix/homeModules/common/starship/default.nix b/nix/homeModules/common/starship/default.nix index 991c86b6..75a3929e 100644 --- a/nix/homeModules/common/starship/default.nix +++ b/nix/homeModules/common/starship/default.nix @@ -1,6 +1,13 @@ +{ lib, config, ... }: + +let + cfg = config.programs.starship; +in + { - programs.starship = { - enableFishIntegration = true; - settings = fromTOML (builtins.readFile ./starship.toml); + + xdg.configFile = lib.mkIf cfg.enable { + "starship.toml".source = ./starship.toml; }; + } diff --git a/nix/homeModules/common/user-nixconf.nix b/nix/homeModules/common/user-nixconf.nix index aea42133..2198f25b 100644 --- a/nix/homeModules/common/user-nixconf.nix +++ b/nix/homeModules/common/user-nixconf.nix @@ -1,9 +1,14 @@ -{ pkgs, lib, ... }: +{ + nixosConfig ? null, + lib, + pkgs, + ... +}: { nix = { - package = lib.mkForce pkgs.nixVersions.nix_2_23; + package = lib.mkDefault (nixosConfig.nix.package or pkgs.nix); settings = { allow-import-from-derivation = "true"; diff --git a/nix/homeModules/common/wired/default.nix b/nix/homeModules/common/wired/default.nix new file mode 100644 index 00000000..942bf652 --- /dev/null +++ b/nix/homeModules/common/wired/default.nix @@ -0,0 +1,27 @@ +{ + pkgs, + config, + lib, + ... +}: + +let + cfg = config.programs.wired; +in + +{ + + options = { + programs.wired = { + enable = lib.mkEnableOption "wired"; + }; + }; + + config = lib.mkIf cfg.enable { + home.packages = [ pkgs.wired ]; + xdg.configFile = { + "wired/wired.ron".source = ./wired.ron; + }; + }; + +} diff --git a/.config/wired/wired.ron b/nix/homeModules/common/wired/wired.ron similarity index 100% rename from .config/wired/wired.ron rename to nix/homeModules/common/wired/wired.ron diff --git a/nix/homeModules/common/xmobar.nix b/nix/homeModules/common/xmobar.nix new file mode 100644 index 00000000..4650c387 --- /dev/null +++ b/nix/homeModules/common/xmobar.nix @@ -0,0 +1,43 @@ +{ + + programs.xmobar.extraConfig = '' + Config { overrideRedirect = False + , font = "Iosevka 11" + , additionalFonts = [ "Noto Color Emoji 9" + ] + , bgColor = "#000000" + , fgColor = "#FFFFFF" + , position = Bottom + , commands = [ Run Kbd + [ ("myDvorakFrench", "🇫🇷") + , ("myDvorak", "🇺🇸") + , ("us", "🇹🇼") + ] + , Run ThermalZone 0 ["-t", "󰔏 °C"] 30 + , Run Alsa "default" "Master" + [ "-t", " %" + , "--" + , "-O", "󰕾" + , "-o", "󰖁" + ] + , Run Memory [ "-t", "󰍛 %" ] 30 + , Run Date "%a %d %H:%M:%S" "date" 10 + , Run Battery + [ "-t", ":%" + , "--" + , "-O", "󰂄" + , "-i", "󱟦" + , "-o", "󰁾" + , "-h", "green" + , "-m", "yell" + , "-l", "red" + ] 10 + , Run XMonadLog + ] + , sepChar = "%" + , alignSep = "}{" + , template = "%XMonadLog% }{ %kbd% | %alsa:default:Master% | %thermal0% | %memory% | %battery% | %date% " + } + ''; + +} diff --git a/nix/homeModules/extra/auto-gc.nix b/nix/homeModules/extra/auto-gc.nix deleted file mode 100644 index d5e76f11..00000000 --- a/nix/homeModules/extra/auto-gc.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - nix.gc = { - automatic = true; - frequency = "weekly"; - options = "--delete-older-than 15d"; - }; -} diff --git a/nix/homeModules/extra/fcitx5/default.nix b/nix/homeModules/extra/fcitx5/default.nix deleted file mode 100644 index f66722c1..00000000 --- a/nix/homeModules/extra/fcitx5/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ pkgs, ... }: - -{ - i18n.inputMethod = { - enabled = "fcitx5"; - fcitx5.addons = [ - pkgs.fcitx5-chinese-addons - pkgs.fcitx5-table-extra - ]; - }; - - xdg.configFile."fcitx5".source = ./fcitx; -} diff --git a/nix/homeModules/extra/neovim-moreLangServers.nix b/nix/homeModules/extra/neovim-moreLangServers.nix index 2a46194f..8f9edf85 100644 --- a/nix/homeModules/extra/neovim-moreLangServers.nix +++ b/nix/homeModules/extra/neovim-moreLangServers.nix @@ -9,7 +9,7 @@ pkgs.nil # nix pkgs.yaml-language-server # yaml - pkgs.nodePackages.pyright # python + pkgs.pyright # python pkgs.marksman # markdown pkgs.taplo # toml diff --git a/nix/homeModules/extra/preset-nix.nix b/nix/homeModules/extra/preset-nix.nix index cc7079c6..e8d65a3a 100644 --- a/nix/homeModules/extra/preset-nix.nix +++ b/nix/homeModules/extra/preset-nix.nix @@ -1,5 +1,9 @@ { pkgs, ... }: +let + inherit (pkgs) myPkgs; +in + { programs.direnv.enable = true; @@ -10,5 +14,7 @@ pkgs.nix-tree pkgs.nurl pkgs.nvd + + myPkgs.nd ]; } diff --git a/nix/homeModules/extra/preset-utilities.nix b/nix/homeModules/extra/preset-utilities.nix index 2be366be..70242d4a 100644 --- a/nix/homeModules/extra/preset-utilities.nix +++ b/nix/homeModules/extra/preset-utilities.nix @@ -2,10 +2,8 @@ { programs = { - starship.enable = true; gpg.enable = true; neovim.enable = true; - tmux.enable = true; }; home.packages = [ pkgs.stow ]; diff --git a/nix/homeModules/named/bismuth/default.nix b/nix/homeModules/named/bismuth/default.nix index d2aea13a..71759a0c 100644 --- a/nix/homeModules/named/bismuth/default.nix +++ b/nix/homeModules/named/bismuth/default.nix @@ -27,5 +27,5 @@ in pkgs.colima ]; - programs.neovim.extraPackages = [ myPkgs.fish-lsp ]; + programs.neovim.extraPackages = [ pkgs.fish-lsp ]; } diff --git a/nix/homeModules/named/carbon/browser.nix b/nix/homeModules/named/carbon/browser.nix deleted file mode 100644 index 96fe7510..00000000 --- a/nix/homeModules/named/carbon/browser.nix +++ /dev/null @@ -1,158 +0,0 @@ -{ pkgs, ... }: - -let - inherit (pkgs) nur; -in - -{ - home.packages = [ - pkgs.cascadia-code # Used in tab bar - ]; - - programs.firefox = { - enable = true; - package = pkgs.firefox-esr; # some options only works with firefox-esr - # https://mozilla.github.io/policy-templates - policies = { - HardwareAcceleration = true; - DisableFirefoxScreenshots = true; - DisablePocket = true; - DisplayMenuBar = "never"; - DisplayBookmarksToolbar = "never"; - NoDefaultBookmarks = true; - OfferToSaveLogins = false; - OfferToSaveLoginsDefault = false; - PasswordManagerEnabled = false; - FirefoxHome = { - Search = true; - TopSites = true; - SponsoredTopSites = false; - Highlights = false; - Pocket = false; - SponsoredPocket = false; - }; - UserMessaging = { - ExtensionRecommendations = false; - SkipOnboarding = true; - }; - DNSOverHTTPS = { - Enabled = true; - }; - EnableTrackingProtection = { - Value = true; - Cryptomining = true; - Fingerprinting = true; - }; - SearchEngines = { - Default = "searxng"; - Add = [ - { - Name = "searxng"; - URLTemplate = "https://searxng.earth2077.fr/search?q={searchTerms}"; - } - ]; - }; - }; - - profiles.leana = { - id = 0; - name = "leana"; - search = { - force = true; - default = "searxng"; - engines = { - "Nix Packages" = { - urls = [ - { - template = "https://search.nixos.org/packages"; - params = [ - { - name = "type"; - value = "packages"; - } - { - name = "query"; - value = "{searchTerms}"; - } - ]; - } - ]; - icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg"; - definedAliases = [ "@np" ]; - }; - Searxng = { - urls = [ { template = "https://searxng.earth2077.fr/search?query={searchTerms}"; } ]; - iconUpdateURL = "https://searxng.earth2077.fr/favicon.png"; - }; - Invidious = { - urls = [ { template = "https://invidious.earth2077.fr/search?q={searchTerms}"; } ]; - definedAliases = [ "@yt" ]; - iconUpdateURL = "https://invidious.earth2077.fr/favicon-32x32.png"; - }; - Hoogle = { - urls = [ { template = "https://hoogle.haskell.org/?hoogle={searchTerms}"; } ]; - iconUpdateURL = "https://hoogle.haskell.org/favicon.png"; - definedAliases = [ "@hg" ]; - }; - Genius = { - urls = [ { template = "https://genius.com/search?q={searchTerms}"; } ]; - iconUpdateURL = "https://genius.com/favicon.ico"; - definedAliases = [ "@ge" ]; - }; - "NixOS Wiki" = { - urls = [ { template = "https://nixos.wiki/index.php?search={searchTerms}"; } ]; - iconUpdateURL = "https://nixos.wiki/favicon.png"; - definedAliases = [ "@nw" ]; - }; - "Wikipedia (en)".metaData.alias = "@wk"; - }; - }; - settings = { - "toolkit.legacyUserProfileCustomizations.stylesheets" = true; - "layout.css.devPixelsPerPx" = 1.2; - "browser.tabs.loadInBackground" = true; - "browser.ctrlTab.sortByRecentlyUsed" = false; - }; - userChrome = - let - onebar = pkgs.fetchFromGitea { - domain = "git.gay"; - owner = "freeplay"; - repo = "Firefox-Onebar"; - rev = "197a5e5298985be3767da504bac153f3b75b63f7"; - hash = "sha256-+AG6dp92//zEROtKQgPPB0YCTGtHywM8AtobvguF1PM="; - }; - in - '' - #statuspanel-label { - font-size: 18px !important; - font-family: "Cascadia Code" !important; - } - .urlbar-input-box { - font-size: 18px !important; - font-family: "Cascadia Code" !important; - } - - ${builtins.readFile "${onebar}/onebar.css"} - ''; - - userContent = '' - /* a css */ - ''; - extensions = - let - addons = nur.repos.rycee.firefox-addons; - in - [ - addons.ublock-origin - addons.privacy-badger - addons.sponsorblock - addons.tridactyl - addons.languagetool - # flaky, find a better source to be fetched - # addons.bypass-paywalls-clean - addons.news-feed-eradicator - ]; - }; - }; -} diff --git a/nix/homeModules/named/carbon/default.nix b/nix/homeModules/named/carbon/default.nix index b086c5f2..d295fb65 100644 --- a/nix/homeModules/named/carbon/default.nix +++ b/nix/homeModules/named/carbon/default.nix @@ -6,8 +6,8 @@ in { imports = [ - ./browser.nix - ./wm.nix + ./firefox.nix + ./gui.nix # system-wide language servers, build tools, compilers ./dev.nix @@ -24,31 +24,28 @@ in pkgs.poppler_utils # pdfseparate, pdfunite myPkgs.easyscan - pkgs.deploy-rs - myPkgs.nd - + pkgs.ranger pkgs.discord - pkgs.fractal - - pkgs.hacksaw - pkgs.shotgun - pkgs.vlc - - pkgs.evolution pkgs.teams-for-linux + pkgs.evolution - myPkgs.typst-mutilate + pkgs.vlc + pkgs.calibre myPkgs.prop-solveur myPkgs.hbf - - pkgs.agenix + pkgs.lucky-commit ]; programs = { kitty.enable = true; password-store.enable = true; + feh.enable = true; + sioyek.enable = true; + cmus.enable = true; }; + i18n.inputMethod.enabled = "fcitx5"; + } diff --git a/nix/homeModules/named/carbon/dev.nix b/nix/homeModules/named/carbon/dev.nix index 8d12d26d..414c550b 100644 --- a/nix/homeModules/named/carbon/dev.nix +++ b/nix/homeModules/named/carbon/dev.nix @@ -6,12 +6,18 @@ in { home.packages = [ - pkgs.jetbrains.idea-community + pkgs.gnumake + pkgs.cmake + + pkgs.iconv + pkgs.sqlite + + # pkgs.jetbrains.idea-community - # keyboard - pkgs.clang-tools - pkgs.qmk - pkgs.wally-cli + # # keyboard + # pkgs.clang-tools + # pkgs.qmk + # pkgs.wally-cli # golang pkgs.go @@ -38,22 +44,27 @@ in (pkgs.metals.override { jre = config.programs.java.package; }) (pkgs.ammonite.override { jre = config.programs.java.package; }) - pkgs.gnumake - pkgs.cmake - - pkgs.iconv - pkgs.sqlite - # isabelle - pkgs.isabelle + myPkgs.isabelle-2023 # module ACF # preview markdown pkgs.python3Packages.grip + + # typst + myPkgs.typst-mutilate + + # xmonad development/configuartion + pkgs.cabal-install + (pkgs.haskellPackages.ghcWithPackages (self: [ + self.xmonad-contrib + self.xmonad-extras + ])) + pkgs.haskell-language-server ]; programs.neovim.extraPackages = [ # fish - myPkgs.fish-lsp + pkgs.fish-lsp # golang pkgs.gopls @@ -69,6 +80,8 @@ in pkgs.jdt-language-server ]; + programs.git.signing.signByDefault = true; + programs.vscode = { enable = true; extensions = [ diff --git a/nix/homeModules/named/carbon/firefox.nix b/nix/homeModules/named/carbon/firefox.nix new file mode 100644 index 00000000..1fb4cc2e --- /dev/null +++ b/nix/homeModules/named/carbon/firefox.nix @@ -0,0 +1,44 @@ +{ pkgs, ... }: + +let + inherit (pkgs) nur; +in + +{ + + programs.firefox = { + + enable = true; + + policies.SearchEngines = { + Default = "searxng"; + Add = [ + { + Name = "searxng"; + URLTemplate = "https://searxng.earth2077.fr/search?q={searchTerms}"; + } + ]; + }; + + profiles.leana = { + settings = { + "toolkit.legacyUserProfileCustomizations.stylesheets" = true; + "layout.css.devPixelsPerPx" = 1.2; + "browser.tabs.loadInBackground" = true; + "browser.ctrlTab.sortByRecentlyUsed" = false; + }; + + extensions = + let + addons = nur.repos.rycee.firefox-addons; + in + [ + addons.sponsorblock + # flaky, find a better source to be fetched + # addons.bypass-paywalls-clean + ]; + + }; + }; + +} diff --git a/nix/homeModules/named/carbon/gui.nix b/nix/homeModules/named/carbon/gui.nix new file mode 100644 index 00000000..108377ed --- /dev/null +++ b/nix/homeModules/named/carbon/gui.nix @@ -0,0 +1,60 @@ +{ pkgs, ... }: + +let + inherit (pkgs) myPkgs; +in + +{ + home.pointerCursor = { + x11.enable = true; + gtk.enable = true; + name = "volantes_cursors"; + package = pkgs.volantes-cursors; + size = 64; + }; + + home.file = { + ".xscreensaver".source = ./xscreensaver/.xscreensaver; + ".wallpaper".source = "${pkgs.wallpapers.nix-logo-lambda}/main.svg"; + }; + + # https://wiki.archlinux.org/title/java#Gray_window,_applications_not_resizing_with_WM,_menus_immediately_closing + # fix all java things that don't scale with XMonad + home.sessionVariables = { + _JAVA_AWT_WM_NONREPARENTING = 1; + }; + + home.packages = [ + # Fonts + pkgs.noto-fonts + pkgs.noto-fonts-lgc-plus + pkgs.noto-fonts-cjk-sans + pkgs.noto-fonts-cjk-serif + pkgs.noto-fonts-color-emoji + pkgs.noto-fonts-emoji-blob-bin + myPkgs.altiosevka-nerd-font-mono + myPkgs.altiosevka + pkgs.jetbrains-mono + + # wm utilities + pkgs.alsa-utils # used to fetch volume in xmobar + myPkgs.xbrightness + pkgs.xmobar + pkgs.wired + pkgs.dmenu + pkgs.xclip + pkgs.playerctl + pkgs.hacksaw + pkgs.shotgun + # talk to xscreensaver + pkgs.xscreensaver + + # audio utilities + pkgs.helvum + pkgs.pavucontrol + pkgs.easyeffects + ]; + + programs.xmobar.enable = true; + programs.wired.enable = true; +} diff --git a/nix/homeModules/named/carbon/wm.nix b/nix/homeModules/named/carbon/wm.nix deleted file mode 100644 index 7082cc12..00000000 --- a/nix/homeModules/named/carbon/wm.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ pkgs, ... }: - -let - inherit (pkgs) myPkgs; - - wallpapers = { - nixos = pkgs.fetchurl { - url = "https://c.wallhere.com/photos/49/ce/Linux_Nixos_operating_system_minimalism-2175179.jpg!d"; - hash = "sha256-RdrkvsVB6fHnyDZQ6wCGc7lUP7FoDYGvx2jfWB1WSvI="; - }; - - sequoia = pkgs.fetchurl { - url = "https://basicappleguy.com/s/SequoiaLight.png"; - hash = "sha256-F3vo07kdE19luHtrBO8Q+Rj0mk+UlgtOSwOVdFW8Vlk="; - }; - - apple-pride-mac = pkgs.fetchurl { - url = "https://basicappleguy.com/s/Pride_Mac2.png"; - hash = "sha256-PkGIlWf554Lk5e2gLDpDg+Rmb9qAniTiNvbV3/pppwA="; - }; - - apple-nebula-ipad = pkgs.fetchurl { - url = "https://basicappleguy.com/s/NebulaiPad.png"; - hash = "sha256-rpWxhCH7eIT7ktRAROvL56eRK0T6AsgGE+iI/CLUF3k="; - }; - - "luz&amity_20_windz" = pkgs.fetchurl { - url = "https://64.media.tumblr.com/a28bd2446401e30cc879a641a3038ac7/fcdeee73cdb01c35-18/s2048x3072/c6c89f6de58d26eeb9848d5f41b20ebbcec94b6d.pnj"; - hash = "sha256-isdyegUoGXZyFDCyBMCNadIv/jry82slXkjcdXpNKrY="; - }; - - nixos-artwork-binary-black_8k = pkgs.fetchurl { - url = "https://github.com/NixOS/nixos-artwork/blob/53ea652ec7d8af5d21fd2b79b6c49cb39078ddfb/wallpapers/nix-wallpaper-binary-black_8k.png?raw=true"; - hash = "sha256-MxEgvzWmdqMeI5GeI6Hzci6yd5iL44NDXyKQOuw+fLY="; - }; - }; - -in - -{ - home.pointerCursor = { - x11.enable = true; - gtk.enable = true; - name = "volantes_cursors"; - package = pkgs.volantes-cursors; - size = 64; - }; - - home.file = { - ".xscreensaver".source = ./xscreensaver/.xscreensaver; - ".wallpaper".source = "${pkgs.wallpapers.y-combinator}/main.svg"; - }; - - # https://wiki.archlinux.org/title/java#Gray_window,_applications_not_resizing_with_WM,_menus_immediately_closing - # fix all java things that don't scale with XMonad - home.sessionVariables = { - _JAVA_AWT_WM_NONREPARENTING = 1; - }; - - home.packages = [ - # Fonts - pkgs.noto-fonts - pkgs.noto-fonts-lgc-plus - pkgs.noto-fonts-cjk-sans - pkgs.noto-fonts-cjk-serif - pkgs.noto-fonts-color-emoji - pkgs.noto-fonts-emoji-blob-bin - myPkgs.altiosevka-nerd-font-mono - myPkgs.altiosevka - - pkgs.xmobar - pkgs.wired - pkgs.jetbrains-mono - - pkgs.dmenu - pkgs.xclip - pkgs.playerctl - - pkgs.cabal-install - (pkgs.haskellPackages.ghcWithPackages (self: [ - self.xmonad-contrib - self.xmonad-extras - ])) - - pkgs.haskell-language-server - myPkgs.xbrightness - pkgs.ranger - ]; -} diff --git a/nix/nixosModules/common/zram.nix b/nix/nixosModules/common/zram.nix new file mode 100644 index 00000000..6d547b5c --- /dev/null +++ b/nix/nixosModules/common/zram.nix @@ -0,0 +1,5 @@ +{ lib, ... }: + +{ + zramSwap.enable = lib.mkDefault true; +} diff --git a/nix/nixosModules/extra/tmp-tmpfs.nix b/nix/nixosModules/extra/tmp-tmpfs.nix index da3f57d8..b71fbacd 100644 --- a/nix/nixosModules/extra/tmp-tmpfs.nix +++ b/nix/nixosModules/extra/tmp-tmpfs.nix @@ -1,3 +1,5 @@ +# Turning off this module is not intuitive, so it's opt-in + { fileSystems."/tmp" = { diff --git a/nix/nixosModules/extra/zram.nix b/nix/nixosModules/extra/zram.nix deleted file mode 100644 index bcf848ba..00000000 --- a/nix/nixosModules/extra/zram.nix +++ /dev/null @@ -1 +0,0 @@ -{ zramSwap.enable = true; } diff --git a/nix/nixosModules/named/carbon/audio.nix b/nix/nixosModules/named/carbon/audio.nix index cdfe2f2f..192ea042 100644 --- a/nix/nixosModules/named/carbon/audio.nix +++ b/nix/nixosModules/named/carbon/audio.nix @@ -1,10 +1,4 @@ -{ pkgs, ... }: { - sound = { - enable = true; - mediaKeys.enable = true; - }; - security.rtkit.enable = true; services.pipewire = { @@ -25,11 +19,6 @@ }; - environment.systemPackages = [ - pkgs.helvum - pkgs.pavucontrol - pkgs.easyeffects - ]; - users.users."leana".extraGroups = [ "audio" ]; + } diff --git a/nix/nixosModules/named/carbon/battery.nix b/nix/nixosModules/named/carbon/battery.nix index 7a9579c5..7afc7ff8 100644 --- a/nix/nixosModules/named/carbon/battery.nix +++ b/nix/nixosModules/named/carbon/battery.nix @@ -1,5 +1,3 @@ -{ pkgs, lib, ... }: - { systemd.sleep.extraConfig = '' HibernateDelaySec=2hour @@ -24,32 +22,4 @@ SOUND_POWER_SAVE_CONTROLLER = "N"; }; }; - - systemd.services."battery-notify" = { - enable = true; - description = "Scream when battery is dying"; - startAt = [ "*:0/5" ]; - unitConfig.After = "multi-user.target"; - serviceConfig.ExecStart = - let - script = pkgs.writeShellApplication { - name = "battery-notify"; - runtimeInputs = [ - pkgs.bc - pkgs.libnotify - ]; - text = '' - battery="/sys/class/power_supply/BAT1" - thres="0.2" - isLow=$(echo "($(cat $battery/energy_now) / $(cat $battery/energy_full)) < $thres" | bc -l) - - if [ "$isLow" -eq 1 ]; then - echo "You're battery level is below $thres" - notify-send -u critical "Battery Low" "Please charge your battery" - fi - ''; - }; - in - lib.getExe script; - }; } diff --git a/nix/nixosModules/named/carbon/bluetooth.nix b/nix/nixosModules/named/carbon/bluetooth.nix deleted file mode 100644 index 87f86ca4..00000000 --- a/nix/nixosModules/named/carbon/bluetooth.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - hardware.bluetooth.enable = true; - services.blueman.enable = true; - # FIXME: this breaks the handsfree microphone mode for XM4 - # environment.etc = { - # "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = '' - # bluez_monitor.properties = { - # ["bluez5.enable-sbc-xq"] = true, - # ["bluez5.enable-msbc"] = true, - # ["bluez5.enable-hw-volume"] = true, - # ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]" - # } - # ''; - # }; -} diff --git a/nix/nixosModules/named/carbon/connectivity.nix b/nix/nixosModules/named/carbon/connectivity.nix new file mode 100644 index 00000000..60e044fc --- /dev/null +++ b/nix/nixosModules/named/carbon/connectivity.nix @@ -0,0 +1,69 @@ +{ config, lib, ... }: + +{ + + networking = { + networkmanager.enable = lib.mkForce false; + + firewall.allowedTCPPorts = [ 8080 ]; + + wireless = { + enable = true; + userControlled.enable = true; + secretsFile = config.age.secrets.wpa_password.path; + networks = + let + ordered = + nss: + lib.pipe nss [ + lib.lists.reverseList + (lib.lists.imap0 (i: lib.mapAttrs (_: n: n // { priority = i; }))) + lib.mergeAttrsList + ]; + in + ordered [ + # first in list is tried first + { + "HiddenParadize@Earth2077".pskRaw = "ext:HOME"; + "Pei’s Wifi".pskRaw = "ext:PEI"; + } + { + "_SNCF_WIFI_INOUI" = { }; + "EurostarTrainsWiFi" = { }; + } + { + eduroam = { + authProtocols = [ "WPA-EAP" ]; + auth = '' + pairwise=CCMP + group=CCMP TKIP + eap=PEAP + ca_cert="${./certs/universite_de_rennes.pem}" + identity="ychiang@etudiant.univ-rennes.fr" + altsubject_match="DNS:radius.univ-rennes1.fr;DNS:radius1.univ-rennes1.fr;DNS:radius2.univ-rennes1.fr;DNS:vmradius-psf1.univ-rennes1.fr;DNS:vmradius-psf2.univ-rennes1.fr" + phase2="auth=MSCHAPV2" + password=ext:EDUROAM + anonymous_identity="anonymous@univ-rennes.fr" + ''; + }; + } + { "iPhone de Léana 江".pskRaw = "ext:PHONE"; } + ]; + }; + }; + + hardware.bluetooth.enable = true; + services.blueman.enable = true; + # FIXME: this breaks the handsfree microphone mode for XM4 + # environment.etc = { + # "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = '' + # bluez_monitor.properties = { + # ["bluez5.enable-sbc-xq"] = true, + # ["bluez5.enable-msbc"] = true, + # ["bluez5.enable-hw-volume"] = true, + # ["bluez5.headset-roles"] = "[ hsp_hs hsp_ag hfp_hf hfp_ag ]" + # } + # ''; + # }; + +} diff --git a/nix/nixosModules/named/carbon/default.nix b/nix/nixosModules/named/carbon/default.nix index b7428396..aa794126 100644 --- a/nix/nixosModules/named/carbon/default.nix +++ b/nix/nixosModules/named/carbon/default.nix @@ -3,19 +3,18 @@ ./hardware-configuration.nix # generated ./battery.nix + ./audio.nix - ./networking.nix - ./bluetooth.nix + ./connectivity.nix + ./input.nix + ./display.nix - ./scanner.nix + ./gui.nix ./restic.nix ./fs.nix ./packages.nix - - ./gui.nix - ./db.nix # M1 BDD course ]; @@ -66,7 +65,5 @@ restic_backblaze_env.file = ../../../secrets/restic_backblaze_env.age; }; - hardware.keyboard.zsa.enable = true; - services.fwupd.enable = true; } diff --git a/nix/nixosModules/named/carbon/gui.nix b/nix/nixosModules/named/carbon/gui.nix index cefbd59a..d39cdfdd 100644 --- a/nix/nixosModules/named/carbon/gui.nix +++ b/nix/nixosModules/named/carbon/gui.nix @@ -1,24 +1,25 @@ { pkgs, ... }: { + + services.xserver.windowManager.xmonad = { + enable = true; + enableContribAndExtras = true; + }; + services.xserver = { enable = true; autoRepeatDelay = 300; autoRepeatInterval = 40; + }; - windowManager.xmonad = { - enable = true; - enableContribAndExtras = true; - }; - - displayManager.lightdm = { - enable = true; - background = "#000000"; - greeters.gtk.cursorTheme = { - name = "volantes_cursors"; - package = pkgs.volantes-cursors; - size = 64; - }; + services.xserver.displayManager.lightdm = { + enable = true; + background = "#000000"; + greeters.gtk.cursorTheme = { + name = "volantes_cursors"; + package = pkgs.volantes-cursors; + size = 64; }; }; @@ -36,14 +37,4 @@ ]; }; - services.libinput = { - mouse = { - naturalScrolling = true; - accelSpeed = "-0.5"; - }; - touchpad = { - naturalScrolling = true; - tapping = false; - }; - }; } diff --git a/nix/nixosModules/named/carbon/input.nix b/nix/nixosModules/named/carbon/input.nix new file mode 100644 index 00000000..b8442a81 --- /dev/null +++ b/nix/nixosModules/named/carbon/input.nix @@ -0,0 +1,22 @@ +{ + + hardware.keyboard.zsa.enable = true; + + services.libinput = { + mouse = { + naturalScrolling = true; + accelSpeed = "-0.5"; + }; + touchpad = { + naturalScrolling = true; + tapping = false; + }; + }; + + users.users.leana.extraGroups = [ "scanner" ]; + hardware.sane = { + enable = true; + brscan5.enable = true; + }; + +} diff --git a/nix/nixosModules/named/carbon/networking.nix b/nix/nixosModules/named/carbon/networking.nix deleted file mode 100644 index 10d44abb..00000000 --- a/nix/nixosModules/named/carbon/networking.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ config, lib, ... }: - -{ - networking.networkmanager.enable = lib.mkForce false; - - networking.firewall.allowedTCPPorts = [ 8080 ]; - - services.hoogle.port = 1992; - - networking.wireless = { - enable = true; - userControlled.enable = true; - environmentFile = config.age.secrets.wpa_password.path; - networks = - let - ordered = - nss: - lib.pipe nss [ - lib.lists.reverseList - (lib.lists.imap0 (i: lib.mapAttrs (_: n: n // { priority = i; }))) - lib.mergeAttrsList - ]; - in - ordered [ - # first in list is tried first - { - "HiddenParadize@Earth2077".psk = "@HOME@"; - "Pei’s Wifi".psk = "@PEI_PASSWORD@"; - } - { - "_SNCF_WIFI_INOUI" = { }; - "EurostarTrainsWiFi" = { }; - } - { - eduroam = { - authProtocols = [ "WPA-EAP" ]; - auth = '' - pairwise=CCMP - group=CCMP TKIP - eap=PEAP - ca_cert="${./certs/universite_de_rennes.pem}" - identity="@EDUROAM_ID@" - altsubject_match="DNS:radius.univ-rennes1.fr;DNS:radius1.univ-rennes1.fr;DNS:radius2.univ-rennes1.fr;DNS:vmradius-psf1.univ-rennes1.fr;DNS:vmradius-psf2.univ-rennes1.fr" - phase2="auth=MSCHAPV2" - password="@EDUROAM_PSK@" - anonymous_identity="anonymous@univ-rennes.fr" - ''; - }; - } - { "iPhone de Léana 江".psk = "@PHONE@"; } - ]; - }; -} diff --git a/nix/nixosModules/named/carbon/packages.nix b/nix/nixosModules/named/carbon/packages.nix index eca89a16..91968eb1 100644 --- a/nix/nixosModules/named/carbon/packages.nix +++ b/nix/nixosModules/named/carbon/packages.nix @@ -1,12 +1,14 @@ { pkgs, ... }: { environment.systemPackages = [ - pkgs.curl - pkgs.stow - pkgs.gcc + pkgs.agenix + pkgs.deploy-rs ]; - programs.vim.defaultEditor = true; + programs.vim = { + enable = true; + defaultEditor = true; + }; programs.git.enable = true; programs.dconf.enable = true; @@ -15,18 +17,6 @@ # programs.steam.enable = true; - services.hoogle = { - enable = true; - packages = - self: - map pkgs.haskell.lib.doHaddock [ - self.xmonad - self.xmonad-contrib - self.xmonad-extras - self.hip # image processing - ]; - }; - virtualisation = { docker.enable = true; virtualbox.host.enable = true; diff --git a/nix/nixosModules/named/carbon/scanner.nix b/nix/nixosModules/named/carbon/scanner.nix deleted file mode 100644 index 812ea90e..00000000 --- a/nix/nixosModules/named/carbon/scanner.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - users.users.leana.extraGroups = [ "scanner" ]; - - hardware.sane = { - enable = true; - brscan5.enable = true; - }; -} diff --git a/nix/nixosModules/shared/system-nixconf.nix b/nix/nixosModules/shared/system-nixconf.nix index 98aaf11c..f93a7285 100644 --- a/nix/nixosModules/shared/system-nixconf.nix +++ b/nix/nixosModules/shared/system-nixconf.nix @@ -1,9 +1,9 @@ -{ pkgs, lib, ... }: +{ lib, pkgs, ... }: { nix = { - package = lib.mkDefault pkgs.nixVersions.nix_2_22; + package = lib.mkDefault pkgs.nix; settings = { extra-substituters = [ @@ -28,6 +28,7 @@ sandbox = true; }; + }; } diff --git a/nix/overlays/default.nix b/nix/overlays/default.nix index 503d3e15..f77c89e5 100644 --- a/nix/overlays/default.nix +++ b/nix/overlays/default.nix @@ -26,6 +26,10 @@ let inherit (inputs.agenix.packages.${final.system}) agenix; inherit (inputs.disko.packages.${final.system}) disko; wallpapers = inputs.wallpapers.packages.${final.system}; + + inherit (import inputs.nixpkgs-stable { inherit (final) system; }) + isabelle + ; }) inputs.nur.overlay diff --git a/nix/packages/default.nix b/nix/packages/default.nix index a7a20fe1..152d193a 100644 --- a/nix/packages/default.nix +++ b/nix/packages/default.nix @@ -89,6 +89,17 @@ in why3-pinned.callPackage ./why3.nix { inherit (alt-ergo-pinned) alt-ergo; }; + isabelle-2023 = + let + isabelle-pin = import (final.fetchFromGitHub { + owner = "nixos"; + repo = "nixpkgs"; + rev = "805a384895c696f802a9bf5bf4720f37385df547"; + hash = "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA="; + }) { inherit (final) system; }; + in + isabelle-pin.isabelle; + maeel = final.callPackage ./maeel.nix { }; tokei = final.callPackage ./tokei { }; # alpha tokei with typst, skel, hledger typst-mutilate = final.callPackage ./typst-mutilate.nix { }; @@ -181,7 +192,6 @@ # Unmerged packages from nixfinal # TODO: use upstream when merged dl-librescore = final.callPackage ./dl-librescore.nix { }; - fish-lsp = final.callPackage ./fish-lsp { }; }); perSystem = diff --git a/nix/packages/fish-lsp/default.nix b/nix/packages/fish-lsp/default.nix deleted file mode 100644 index 2ebc5041..00000000 --- a/nix/packages/fish-lsp/default.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - mkYarnPackage, - fetchFromGitHub, - fetchYarnDeps, - fish, - fixup-yarn-lock, - nodejs, - yarn, - makeWrapper, -}: - -mkYarnPackage rec { - pname = "fish-lsp"; - version = "1.0.7"; - - src = fetchFromGitHub { - owner = "ndonfris"; - repo = pname; - rev = "v${version}"; - sha256 = "sha256-Np7ELQxHqSnkzVkASYSyO9cTiO1yrakDuK88kkACNAI="; - }; - - offlineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; - hash = "sha256-hmaLWO1Sj+2VujrGD2A+COfVE2D+tCnxyojjq1512K4="; - }; - - nativeBuildInputs = [ - fish - fixup-yarn-lock - nodejs - yarn - makeWrapper - ]; - - buildPhase = '' - runHook preBuild - wasm_file=$(find node_modules -type f -a -name tree-sitter-fish.wasm) - cp -f $wasm_file ./deps/fish-lsp - yarn run sh:build-time - yarn --offline compile - yarn run sh:relink - # yarn run sh:build-completions - runHook postBuild - ''; - - postInstall = '' - wrapProgram "$out/bin/fish-lsp" \ - --set-default fish_lsp_logfile "/tmp/fish_lsp_logs.txt" - ''; -} diff --git a/nix/pre-commit/default.nix b/nix/pre-commit/default.nix index 76a2e032..358ed0ae 100644 --- a/nix/pre-commit/default.nix +++ b/nix/pre-commit/default.nix @@ -9,8 +9,7 @@ check.enable = true; settings.hooks = { # nix - nixfmt.enable = true; - nixfmt.package = pkgs.nixfmt-rfc-style; + nixfmt-rfc-style.enable = true; statix.enable = true; deadnix.enable = true; diff --git a/nix/secrets/wpa_password.age b/nix/secrets/wpa_password.age index 740a4fba..90f56fc8 100644 --- a/nix/secrets/wpa_password.age +++ b/nix/secrets/wpa_password.age @@ -1,13 +1,15 @@ age-encryption.org/v1 --> ssh-ed25519 MpsldQ YxgtkqRX3R1XZwNxGP0OvEFY92ywVx7f9Wf5bMlDNAY -2gssMaJ+1szhbm5qNvIYoYZxTrrp7esgLeXIrxpaCcY --> ssh-ed25519 psbyeg NFsec/KYd/bLXGYR/9/ysJLetl4irUE6L00hDXVVegE -2L18dvihR7ces+3dTxPtlDjbsvztn0Et4S/3Ztz4uCY --> ssh-ed25519 mb5p2g NJ/vH5F9nLkCUh5bKRgjfOis7F68J8WffM74YGrcmD8 -pDiliBr1CW47+Ig4ahaev6cr/m4VIHzzIVanewfQVR0 --> ssh-ed25519 xgADbA tkEYJseYWwukdPVRxr9IIY6P23b0mTfABxzIQXo5xGo -FX6HybXfARvzjbIFyXuCjtgVYnJXd9LEliNCuqYJQhQ --> uYQ=m;$P-grease _75 i -/XdxuliOTRmVfGc ---- uLl8bpfQFXBeKqr89n1QPFb8zNd0E4gMC9bwVIRwCYE -BDe(l4aRGJ N{[(8*Tj>juFQ #^~~ߪیZ0#Tmn%sz~gJ6p<;#wÅXX!*E 'm4߶R#%iCi#Jk}D 5AhoUZB}$4>+ h{0% M)e \ No newline at end of file +-> ssh-ed25519 MpsldQ 7B6B7t/E/QytBgSpvXm72Y8g8jWvB81gMDhIsmtellM +CJGOD8lziDepa1e8JbCCH+5nwQWysFvrhYI/wjBkWt8 +-> ssh-ed25519 psbyeg W6L7CqP1Tvx5hOe9cuVZUDS20BjhmzmSvzR+YjnDMjs +YDQ4f0zpGEDJFo+rkwYEMIoxNeUjvxpoJOl9RZIoxog +-> ssh-ed25519 mb5p2g BRcPl2X5vT5lKZzA3Audy2mybUHelFAvvCLCROPGDUE +HW7CsWuHzFG8bVLmKfY0aWn4mjYXJ17vBO1+QgmryEk +-> ssh-ed25519 xgADbA cEKkEQ1jHiTSqDzMYUUO2yTF9E5WAemGOlZuLnZUYks +iJFJvHqge48Fd23EitzW35q/xvgefw0d1PV0gAI2PPI +-> R-grease Tiw)f GY+)-? +9fIykQS1IAYqFmvqbrrmxja/6DO8iPg +--- ugg3pwZHv6SMoqdSSqga5Qdj6B93Q2gO045jWnxMSig +=\7 3AT w E1`GI & +r5[2#͔vEGCI`$-?u8~e|3о$uro % +> 7 o-X \ No newline at end of file