diff --git a/apps/de/default.nix b/apps/de/default.nix index d5ce532f61d6f008683fba3031c410c49978c57b..25c34e35131dfb70ccbda8ea2164784d9ddd55d4 100644 --- a/apps/de/default.nix +++ b/apps/de/default.nix @@ -21,7 +21,6 @@ }; "org/gnome/desktop/interface" = { document-font-name = "MonaspiceXe Nerd Font Regular 10"; monospace-font-name = "MonaspiceAr Nerd Font Regular 10"; - color-scheme = "prefer-dark"; }; }; diff --git a/apps/nogui/go.nix b/apps/nogui/go.nix index 527efff0355c41759d59929a897a15178ac4d330..47f4a8ff1620cf059b4b8af0202d73a551f80cab 100644 --- a/apps/nogui/go.nix +++ b/apps/nogui/go.nix @@ -1,12 +1,10 @@ let - GOPATH = ".local/share/go"; + goPath = ".local/share/go"; in { programs.go = { + inherit goPath; enable = true; - env = { - inherit GOPATH; - GOBIN = "${GOPATH}/bin"; - }; + goBin = "${goPath}/bin"; }; } diff --git a/apps/nogui/gpg.nix b/apps/nogui/gpg.nix index 86f080d7aa8a6a9a72cb3d361e97dfa839242111..bbf88d12445212bfa5f9e7f2d37cb5dcdb0864cb 100644 --- a/apps/nogui/gpg.nix +++ b/apps/nogui/gpg.nix @@ -34,6 +34,6 @@ services.gpg-agent = { enable = false; enableExtraSocket = true; enableSshSupport = true; - pinentry.package = pkgs.pinentry-gnome3; + pinentryPackage = pkgs.pinentry-gnome3; }; } diff --git a/apps/nogui/jj.nix b/apps/nogui/jj.nix index b77e6e987dd88e9e4e60e1472185b0ae492af8a9..36438c2a97f65e11610663bf4cbdb5387c119a7e 100644 --- a/apps/nogui/jj.nix +++ b/apps/nogui/jj.nix @@ -8,7 +8,7 @@ name = "jolheiser"; email = "git@jolheiser.com"; }; ui = { - diff-formatter = [ + diff.tool = [ "${pkgs.difftastic}/bin/difft" "--color=always" "$left" @@ -18,7 +18,7 @@ editor = "hx"; paginate = "never"; default-command = "log"; }; - templates.git_push_bookmark = ''"change/" ++ change_id.short()''; + git.push-bookmark-prefix = "change/"; signing = { behavior = "own"; backend = "ssh"; diff --git a/apps/nogui/nushell/git-bug.nu b/apps/nogui/nushell/git-bug.nu index c0f421229e60b912d8daa9b7bfaa86a7824e2934..3678b9b9c2dadfdd0e4ad2155bbfd0ee5700132b 100644 --- a/apps/nogui/nushell/git-bug.nu +++ b/apps/nogui/nushell/git-bug.nu @@ -1,6 +1,6 @@ export def "git bug init" [] { git bug pull - let id = ^git-bug user -f json | from json | where name == 'jolheiser' | get --optional human_id.0 + let id = ^git-bug user -f json | from json | where name == 'jolheiser' | get -i human_id.0 if ($id | is-not-empty) { ^git-bug user adopt $id } else { diff --git a/apps/nogui/nushell/ssh.nu b/apps/nogui/nushell/ssh.nu index 5c38eadcca29ddd14b9ce99621010fd57f550322..2c02adb50079878495a244dec118bfcf1a4dc829 100644 --- a/apps/nogui/nushell/ssh.nu +++ b/apps/nogui/nushell/ssh.nu @@ -63,7 +63,7 @@ def "nu-complete ssh-host" [] { mut files = [ '/etc/ssh/ssh_config', '~/.ssh/config' - ] | where { |file| $file | path exists } + ] | filter { |file| $file | path exists } $files | each { |file| diff --git a/apps/nogui/ssh.nix b/apps/nogui/ssh.nix index cdccc297670b646dcfe3a57e3ef4124a36589fd1..b6afe164c19bae3bec0d1683807c105959e3ce2b 100644 --- a/apps/nogui/ssh.nix +++ b/apps/nogui/ssh.nix @@ -6,20 +6,6 @@ includes = [ config.age.secrets.ssh-config.path ]; extraConfig = '' IdentitiesOnly yes ''; - # TODO modify this? This is what the old defaults were. - enableDefaultConfig = false; - matchBlocks."*" = { - forwardAgent = false; - addKeysToAgent = "no"; - compression = false; - serverAliveInterval = 0; - serverAliveCountMax = 3; - hashKnownHosts = false; - userKnownHostsFile = "~/.ssh/known_hosts"; - controlMaster = "no"; - controlPath = "~/.ssh/master-%r@%n:%p"; - controlPersist = "no"; - }; }; services.ssh-agent.enable = true; } diff --git a/flake.lock b/flake.lock index a24712ce9dc46a9ee919b6942cd9bcb302ffb50e..a3e64ca128b8fe07b1b055a6c9b6314bdf3e5e3b 100644 --- a/flake.lock +++ b/flake.lock @@ -12,11 +12,11 @@ ], "systems": "systems" }, "locked": { - "lastModified": 1754433428, - "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", + "lastModified": 1747575206, + "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=", "owner": "ryantm", "repo": "agenix", - "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", + "rev": "4835b1dc898959d8547a871ef484930675cb47f1", "type": "github" }, "original": { @@ -30,11 +30,11 @@ "inputs": { "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1756152754, - "narHash": "sha256-GWXqV/BD7AisNVmJw92Ft3myWD48H23+cmyV17yEe6E=", + "lastModified": 1729195705, + "narHash": "sha256-adYNn7zLF0WL/QnwuCf+qo/x2BRV5qmZUZK0uAaS8vg=", "ref": "refs/heads/main", - "rev": "2d0ac7163fc5126251847c958793c75aea8c4ac9", - "revCount": 11, + "rev": "281b64352ff6a2bcca6ce2c5e4b3adc8d08d32d3", + "revCount": 10, "type": "git", "url": "https://git.jolheiser.com/cfg.git" }, @@ -87,11 +87,11 @@ "inputs": { "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1754481695, - "narHash": "sha256-stYwz0zQrjZXMl4+OlpHqa2yNesDU3ZhteNn4Sr7hJA=", + "lastModified": 1754448815, + "narHash": "sha256-Kk7p7bNfjBlaHa0rZR71kwbrbawHDR/l0KdNSBbJjUY=", "ref": "refs/heads/main", - "rev": "ca81e960f7faf55a686e2d5cb24e40840e85cc3d", - "revCount": 33, + "rev": "c6c255ff885c7219b1a3e6521289409fd268239b", + "revCount": 32, "type": "git", "url": "https://git.jolheiser.com/helix.drv.git" }, @@ -107,11 +107,11 @@ "nixpkgs" ] }, "locked": { - "lastModified": 1757809953, - "narHash": "sha256-29mlXbfAJhz9cWVrPP4STvVPDVZFCfCOmaIN5lFJa+Y=", + "lastModified": 1748391243, + "narHash": "sha256-7sCuihzsTRZemtbTXaFUoGJUfuQErhKEcL9v7HKIo1k=", "owner": "nix-community", "repo": "home-manager", - "rev": "17a10049486f6698fca32097d8f52c0c895542b0", + "rev": "f5b12be834874f7661db4ced969a621ab2d57971", "type": "github" }, "original": { @@ -122,11 +122,11 @@ } }, "nixos-hardware": { "locked": { - "lastModified": 1757775351, - "narHash": "sha256-xWsxmNHwt9jV/yFJqzsNeilpH4BR8MPe44Yt0eaGAIM=", + "lastModified": 1747900541, + "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "f89c620d3d6e584d98280b48f0af7be4f8506ab5", + "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", "type": "github" }, "original": { @@ -138,11 +138,11 @@ } }, "nixpkgs": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1717786204, + "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", "type": "github" }, "original": { @@ -186,11 +186,11 @@ } }, "nixpkgs_4": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { @@ -202,11 +202,11 @@ } }, "nixpkgs_5": { "locked": { - "lastModified": 1757745802, - "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", + "lastModified": 1748190013, + "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1", + "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", "type": "github" }, "original": { @@ -234,16 +234,16 @@ } }, "nixpkgs_7": { "locked": { - "lastModified": 1756911493, - "narHash": "sha256-6n/n1GZQ/vi+LhFXMSyoseKdNfc2QQaSBXJdgamrbkE=", + "lastModified": 1726937504, + "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c6a788f552b7b7af703b1a29802a7233c0067908", + "rev": "9357f4f23713673f310988025d9dc261c20e70c6", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -266,14 +266,15 @@ }, "nur": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_5", + "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1757845540, - "narHash": "sha256-WuMsp7TgnuztF9oOdkbP2s3c2gBagRl9pbcVCWyfA1A=", + "lastModified": 1748393063, + "narHash": "sha256-G7xbGhrSZqlMYrrjqe6HOG/yQldfnCaa7ZuPVteiIOE=", "owner": "nix-community", "repo": "NUR", - "rev": "c8366ecedc158e4884015657a8eb739ccb0092a6", + "rev": "86cc4fe96799d2415a824daf0cfcdfc7205e7fca", "type": "github" }, "original": { @@ -320,11 +321,11 @@ "inputs": { "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1757116466, - "narHash": "sha256-ZYlc2K0myyPPm+8GfQygane2p3l6r3PpHKqEjezisdw=", + "lastModified": 1732207908, + "narHash": "sha256-qXsiaX1diDURGPFTn3HDepf5IIVV05qFqMap4niQW8I=", "ref": "refs/heads/main", - "rev": "a85e91448811bd48dc74b21b2df8690a32e9f27d", - "revCount": 25, + "rev": "3be0914920858646d81643c64b1492364824f351", + "revCount": 24, "type": "git", "url": "https://git.jolheiser.com/go-spectre.git" }, @@ -379,6 +380,27 @@ }, "original": { "owner": "tailscale-dev", "repo": "tclip", + "type": "github" + } + }, + "treefmt-nix": { + "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" } },