diff options
| -rw-r--r-- | configuration.nix | 12 | ||||
| -rw-r--r-- | flake.lock | 249 | ||||
| -rw-r--r-- | home.nix | 59 |
3 files changed, 106 insertions, 214 deletions
diff --git a/configuration.nix b/configuration.nix index 78ff8ad..0a15d60 100644 --- a/configuration.nix +++ b/configuration.nix @@ -1,7 +1,11 @@ -{pkgs, ...}: { - imports = [./hardware-configuration.nix]; +{ pkgs, ... }: +{ + imports = [ ./hardware-configuration.nix ]; nix.settings = { - experimental-features = ["nix-command" "flakes"]; + experimental-features = [ + "nix-command" + "flakes" + ]; auto-optimise-store = true; }; boot = { @@ -46,7 +50,7 @@ ''; }; }; - fonts.packages = [pkgs.hermit]; + fonts.packages = [ pkgs.hermit ]; services = { openssh.enable = true; xserver = { @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1736955230, - "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=", + "lastModified": 1754433428, + "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=", "owner": "ryantm", "repo": "agenix", - "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", + "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d", "type": "github" }, "original": { @@ -29,11 +29,11 @@ ] }, "locked": { - "lastModified": 1700795494, - "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=", + "lastModified": 1744478979, + "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d", + "rev": "43975d782b418ebf4969e9ccba82466728c2851b", "type": "github" }, "original": { @@ -43,42 +43,6 @@ "type": "github" } }, - "devshell": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1722113426, - "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=", - "owner": "numtide", - "repo": "devshell", - "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, - "flake-compat": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -88,11 +52,11 @@ ] }, "locked": { - "lastModified": 1726153070, - "narHash": "sha256-HO4zgY0ekfwO5bX0QH/3kJ/h4KvUDFZg8YpkNwIbg1U=", + "lastModified": 1754487366, + "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "bcef6817a8b2aa20a5a6dbb19b43e63c5bf8619a", + "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", "type": "github" }, "original": { @@ -106,11 +70,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -119,62 +83,6 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": [ - "nixvim", - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore", - "nixpkgs": [ - "nixvim", - "nixvim", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1726745158, - "narHash": "sha256-D5AegvGoEjt4rkKedmxlSEmC+nNLMBPWFxvmYnVLhjk=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "4e743a6920eab45e8ba0fbe49dc459f1423a4b74", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixvim", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -183,11 +91,11 @@ ] }, "locked": { - "lastModified": 1703113217, - "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "lastModified": 1745494811, + "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", "owner": "nix-community", "repo": "home-manager", - "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", "type": "github" }, "original": { @@ -203,11 +111,11 @@ ] }, "locked": { - "lastModified": 1739470101, - "narHash": "sha256-NxNe32VB4XI/xIXrsKmIfrcgtEx5r/5s52pL3CpEcA4=", + "lastModified": 1755229570, + "narHash": "sha256-soZegto0xXzG2zYlu/zjknDHv0Z7tRS5EQs+Z/VRTBg=", "owner": "nix-community", "repo": "home-manager", - "rev": "5031c6d2978109336637977c165f82aa49fa16a7", + "rev": "11626a4383b458f8dc5ea3237eaa04e8ab1912f3", "type": "github" }, "original": { @@ -216,73 +124,59 @@ "type": "github" } }, - "home-manager_3": { + "ixx": { "inputs": { - "nixpkgs": [ + "flake-utils": [ "nixvim", "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1726902823, - "narHash": "sha256-Gkc7pwTVLKj4HSvRt8tXNvosl8RS9hrBAEhOjAE0Tt4=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "14929f7089268481d86b83ed31ffd88713dcd415", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, - "nix-darwin": { - "inputs": { + "nuschtosSearch", + "flake-utils" + ], "nixpkgs": [ "nixvim", "nixvim", + "nuschtosSearch", "nixpkgs" ] }, "locked": { - "lastModified": 1726742753, - "narHash": "sha256-QclpWrIFIg/yvWRiOUaMp1WR+TGUE9tb7RE31xHlxWc=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "c03f85fa42d68d1056ca1740f3113b04f3addff2", + "lastModified": 1748294338, + "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", + "owner": "NuschtOS", + "repo": "ixx", + "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", "type": "github" }, "original": { - "owner": "lnl7", - "repo": "nix-darwin", + "owner": "NuschtOS", + "ref": "v0.0.8", + "repo": "ixx", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "lastModified": 1754028485, + "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "rev": "59e69648d345d6e8fef86158c555730fa12af9de", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1739214665, - "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -294,11 +188,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1726755586, - "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", + "lastModified": 1755186698, + "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", + "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", "type": "github" }, "original": { @@ -310,16 +204,16 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1726755586, - "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", + "lastModified": 1754393734, + "narHash": "sha256-fbnmAwTQkuXHKBlcL5Nq1sMAzd3GFqCOQgEQw6Hy0Ak=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", + "rev": "a683adc19ff5228af548c6539dbc3440509bfed3", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } @@ -330,11 +224,11 @@ "nixvim": "nixvim_2" }, "locked": { - "lastModified": 1726936094, - "narHash": "sha256-ZBhSLpdGTJ++cJ53pvnpAHxf4Iw8EVMhnCemkcBgaWk=", + "lastModified": 1755272752, + "narHash": "sha256-ybZAC8y6o7VjfbDhCSZNFgRTi7ins+7VEs0sTgbFAp0=", "ref": "refs/heads/master", - "rev": "a1140b2d47df62214537abaea86974c2a14c39b2", - "revCount": 5, + "rev": "74b03874475bf82bb7d38f38dd608dabf8da9a26", + "revCount": 7, "type": "git", "url": "https://git.tombarrett.xyz/nixvim" }, @@ -345,22 +239,17 @@ }, "nixvim_2": { "inputs": { - "devshell": "devshell", - "flake-compat": "flake-compat", "flake-parts": "flake-parts", - "git-hooks": "git-hooks", - "home-manager": "home-manager_3", - "nix-darwin": "nix-darwin", "nixpkgs": "nixpkgs_4", "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": "treefmt-nix" + "systems": "systems_3" }, "locked": { - "lastModified": 1726934957, - "narHash": "sha256-ygq8w1bvpbKS2+ePSXt3HQvM+ea10yoRAE2c1L9XruA=", + "lastModified": 1755095763, + "narHash": "sha256-cFwtMaONA4uKYk/rBrmFvIAQieZxZytoprzIblTn1HA=", "owner": "nix-community", "repo": "nixvim", - "rev": "384f97cf50c534a18f5a8feac81d40623267aa81", + "rev": "ecc7880e00a2a735074243d8a664a931d73beace", "type": "github" }, "original": { @@ -372,6 +261,7 @@ "nuschtosSearch": { "inputs": { "flake-utils": "flake-utils", + "ixx": "ixx", "nixpkgs": [ "nixvim", "nixvim", @@ -379,11 +269,11 @@ ] }, "locked": { - "lastModified": 1726816132, - "narHash": "sha256-AbB0lgc0IbzLIxj1O3cosiMNAVQak4KJtvq9q8MjHhs=", + "lastModified": 1754301638, + "narHash": "sha256-aRgzcPDd2axHFOuMlPLuzmDptUM2JU8mUL3jfgbBeyc=", "owner": "NuschtOS", "repo": "search", - "rev": "7733a39a1321057172d87e6251ded7cdeb67171e", + "rev": "a60091045273484c040a91f5c229ba298f8ecc27", "type": "github" }, "original": { @@ -430,25 +320,18 @@ "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixvim", - "nixpkgs" - ] - }, + "systems_3": { "locked": { - "lastModified": 1726734507, - "narHash": "sha256-VUH5O5AcOSxb0uL/m34dDkxFKP6WLQ6y4I1B4+N3L2w=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "ee41a466c2255a3abe6bc50fc6be927cdee57a9f", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { - "owner": "numtide", - "repo": "treefmt-nix", + "owner": "nix-systems", + "repo": "default", "type": "github" } } @@ -4,7 +4,8 @@ nixvim, pkgs, ... -}: let +}: +let vars = { BEMENU_OPTS = "--fn 'Hermit 12' --line-height 25 " @@ -12,7 +13,8 @@ + "--tf #f8f8f8 --fbf #f8f8f8 --ff #f8f8f8 --cf #f8f8f8 " + "--sf #f8f8f8 --scf #f8f8f8"; }; -in { +in +{ home = { username = "tom"; homeDirectory = "/home/tom"; @@ -27,6 +29,7 @@ in { brave btop cmake + dive dpkg feh file @@ -43,8 +46,10 @@ in { mpv ncdu ncmpcpp + nix-tree nixvim.packages.x86_64-linux.default nmap + obs-studio pavucontrol pciutils python3Packages.ipython @@ -56,14 +61,14 @@ in { tmux tree unzip + usbutils + wireguard-tools xautolock xmobar ]; - sessionVariables = - vars - // { - LESS = "-R -F"; - }; + sessionVariables = vars // { + LESS = "-R -F"; + }; file.".xinitrc".text = '' xmonad @@ -71,11 +76,9 @@ in { # todo find better solution for # restarting without nixos switch file.".config/xmonad/xmonad.hs".source = - config.lib.file.mkOutOfStoreSymlink - "${config.home.homeDirectory}/src/nixos/xmonad.hs"; + config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/src/nixos/xmonad.hs"; file.".xmobarrc".source = - config.lib.file.mkOutOfStoreSymlink - "${config.home.homeDirectory}/src/nixos/xmobarrc"; + config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/src/nixos/xmobarrc"; }; programs = { home-manager.enable = true; @@ -117,7 +120,7 @@ in { gpg.enable = true; password-store = { enable = true; - package = pkgs.pass.withExtensions (exts: [exts.pass-otp]); + package = pkgs.pass.withExtensions (exts: [ exts.pass-otp ]); }; vim = { enable = true; @@ -142,25 +145,27 @@ in { gpg-agent = { enable = true; enableSshSupport = true; - pinentryPackage = pkgs.pinentry-bemenu; + pinentry.package = pkgs.pinentry-bemenu; # from gpg --list-secret-keys --with-keygrip ([A] keygrip) - sshKeys = [""]; + sshKeys = [ "" ]; }; }; xdg.userDirs = { enable = true; - extraConfig = let - downloads = "${config.home.homeDirectory}/downloads"; - in { - XDG_DESKTOP_DIR = downloads; - XDG_DOCUMENTS_DIR = downloads; - XDG_DOWNLOAD_DIR = downloads; - XDG_MISC_DIR = downloads; - XDG_MUSIC_DIR = downloads; - XDG_PICTURES_DIR = downloads; - XDG_PUBLICSHARE_DIR = downloads; - XDG_TEMPLATES_DIR = downloads; - XDG_VIDEOS_DIR = downloads; - }; + extraConfig = + let + downloads = "${config.home.homeDirectory}/downloads"; + in + { + XDG_DESKTOP_DIR = downloads; + XDG_DOCUMENTS_DIR = downloads; + XDG_DOWNLOAD_DIR = downloads; + XDG_MISC_DIR = downloads; + XDG_MUSIC_DIR = downloads; + XDG_PICTURES_DIR = downloads; + XDG_PUBLICSHARE_DIR = downloads; + XDG_TEMPLATES_DIR = downloads; + XDG_VIDEOS_DIR = downloads; + }; }; } |