Compare commits
46 Commits
a20313d46a
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| 6b669988f0 | |||
| ae74da869a | |||
| f8eccabdb3 | |||
| 07fd3a6afc | |||
| 64e97bd330 | |||
| 52569da057 | |||
| b7ff106a25 | |||
| ecd325b830 | |||
| 52e7d921d6 | |||
| 567f8ca405 | |||
| 4f5a315521 | |||
| a6496a874d | |||
| 7fea267494 | |||
| d668ea2616 | |||
| 0fc551c8c5 | |||
| f17f1de522 | |||
| c78505aa09 | |||
| 3cd724436b | |||
| c183a0a551 | |||
| c0a1f5495f | |||
| 5996a33269 | |||
| 51045c91d6 | |||
| 0a2fb9609c | |||
| b121b0e556 | |||
| 48ed783db5 | |||
| dd4a2adcfd | |||
| 6c6af12ef6 | |||
| fd2e474229 | |||
| 70cc2587aa | |||
| 80c6d1bfe2 | |||
| a9a6518dee | |||
| 1cafcc70b5 | |||
| e4225a8156 | |||
| 2b9c7d57ba | |||
| fc3f547192 | |||
| a9beac4f61 | |||
| aa461a8344 | |||
| 7592ee3f2f | |||
| 7ac853ab56 | |||
| 142c8309fd | |||
| 25a8b04f18 | |||
| 48f9a7ad02 | |||
| 5199d55c29 | |||
| a915a3a779 | |||
| 5dfff01c9f | |||
| dd30c16492 |
265
flake.lock
generated
265
flake.lock
generated
@@ -5,11 +5,11 @@
|
||||
"fromYaml": "fromYaml"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1732200724,
|
||||
"narHash": "sha256-+R1BH5wHhfnycySb7Sy5KbYEaTJZWm1h+LW1OtyhiTs=",
|
||||
"lastModified": 1755819240,
|
||||
"narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
|
||||
"owner": "SenchoPens",
|
||||
"repo": "base16.nix",
|
||||
"rev": "153d52373b0fb2d343592871009a286ec8837aec",
|
||||
"rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -21,27 +21,28 @@
|
||||
"base16-fish": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1622559957,
|
||||
"narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=",
|
||||
"lastModified": 1765809053,
|
||||
"narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=",
|
||||
"owner": "tomyun",
|
||||
"repo": "base16-fish",
|
||||
"rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe",
|
||||
"rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "tomyun",
|
||||
"repo": "base16-fish",
|
||||
"rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"base16-helix": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1736852337,
|
||||
"narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=",
|
||||
"lastModified": 1760703920,
|
||||
"narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-helix",
|
||||
"rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5",
|
||||
"rev": "d646af9b7d14bff08824538164af99d0c521b185",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -70,11 +71,11 @@
|
||||
"firefox-gnome-theme": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1741628778,
|
||||
"narHash": "sha256-RsvHGNTmO2e/eVfgYK7g+eYEdwwh7SbZa+gZkT24MEA=",
|
||||
"lastModified": 1764873433,
|
||||
"narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
|
||||
"owner": "rafaelmardojai",
|
||||
"repo": "firefox-gnome-theme",
|
||||
"rev": "5a81d390bb64afd4e81221749ec4bffcbeb5fa80",
|
||||
"rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -83,35 +84,19 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"locked": {
|
||||
"lastModified": 1733328505,
|
||||
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-parts": {
|
||||
"inputs": {
|
||||
"nixpkgs-lib": [
|
||||
"stylix",
|
||||
"nur",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1733312601,
|
||||
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
|
||||
"lastModified": 1767609335,
|
||||
"narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
|
||||
"rev": "250481aafeb741edfe23d29195671c19b36b6dca",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -120,27 +105,6 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": [
|
||||
"stylix",
|
||||
"systems"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1731533236,
|
||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fromYaml": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
@@ -157,69 +121,23 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"git-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": [
|
||||
"stylix",
|
||||
"flake-compat"
|
||||
],
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": [
|
||||
"stylix",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741379162,
|
||||
"narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"gitignore": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"stylix",
|
||||
"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"
|
||||
}
|
||||
},
|
||||
"gnome-shell": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1732369855,
|
||||
"narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=",
|
||||
"host": "gitlab.gnome.org",
|
||||
"lastModified": 1767737596,
|
||||
"narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
|
||||
"owner": "GNOME",
|
||||
"repo": "gnome-shell",
|
||||
"rev": "dadd58f630eeea41d645ee225a63f719390829dc",
|
||||
"type": "github"
|
||||
"rev": "ef02db02bf0ff342734d525b5767814770d85b49",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
"host": "gitlab.gnome.org",
|
||||
"owner": "GNOME",
|
||||
"ref": "47.2",
|
||||
"ref": "gnome-49",
|
||||
"repo": "gnome-shell",
|
||||
"type": "github"
|
||||
"type": "gitlab"
|
||||
}
|
||||
},
|
||||
"home-manager": {
|
||||
@@ -227,51 +145,31 @@
|
||||
"nixpkgs": "nixpkgs"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742996658,
|
||||
"narHash": "sha256-snxgTLVq6ooaD3W3mPHu7LVWpoZKczhxHAUZy2ea4oA=",
|
||||
"lastModified": 1768949235,
|
||||
"narHash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "693840c01b9bef9e54100239cef937e53d4661bf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"home-manager_2": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"stylix",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741635347,
|
||||
"narHash": "sha256-2aYfV44h18alHXopyfL4D9GsnpE5XlSVkp4MGe586VU=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "7fb8678716c158642ac42f9ff7a18c0800fea551",
|
||||
"rev": "75ed713570ca17427119e7e204ab3590cc3bf2a5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-25.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1742806253,
|
||||
"narHash": "sha256-zvQ4GsCJT6MTOzPKLmlFyM+lxo0JGQ0cSFaZSACmWfY=",
|
||||
"owner": "NixOS",
|
||||
"lastModified": 1769302137,
|
||||
"narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "ecaa2d911e77c265c2a5bac8b583c40b0f151726",
|
||||
"rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"owner": "nixos",
|
||||
"ref": "master",
|
||||
"repo": "nixos-hardware",
|
||||
"type": "github"
|
||||
@@ -279,67 +177,69 @@
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1742422364,
|
||||
"narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
|
||||
"lastModified": 1767799921,
|
||||
"narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
|
||||
"rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"ref": "nixos-25.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1742889210,
|
||||
"narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=",
|
||||
"lastModified": 1769318308,
|
||||
"narHash": "sha256-Mjx6p96Pkefks3+aA+72lu1xVehb6mv2yTUUqmSet6Q=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "698214a32beb4f4c8e3942372c694f40848b360d",
|
||||
"rev": "1cd347bf3355fce6c64ab37d3967b4a2cb4b878c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nixos",
|
||||
"ref": "nixos-unstable",
|
||||
"ref": "nixos-25.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1741513245,
|
||||
"narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
|
||||
"lastModified": 1767799921,
|
||||
"narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
|
||||
"rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"ref": "nixos-25.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"inputs": {
|
||||
"flake-parts": "flake-parts",
|
||||
"flake-parts": [
|
||||
"stylix",
|
||||
"flake-parts"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"stylix",
|
||||
"nixpkgs"
|
||||
],
|
||||
"treefmt-nix": "treefmt-nix"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1741693509,
|
||||
"narHash": "sha256-emkxnsZstiJWmGACimyAYqIKz2Qz5We5h1oBVDyQjLw=",
|
||||
"lastModified": 1767886815,
|
||||
"narHash": "sha256-pB2BBv6X9cVGydEV/9Y8+uGCvuYJAlsprs1v1QHjccA=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "5479646b2574837f1899da78bdf9a48b75a9fb27",
|
||||
"rev": "4ff84374d77ff62e2e13a46c33bfeb73590f9fef",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -363,11 +263,8 @@
|
||||
"base16-helix": "base16-helix",
|
||||
"base16-vim": "base16-vim",
|
||||
"firefox-gnome-theme": "firefox-gnome-theme",
|
||||
"flake-compat": "flake-compat",
|
||||
"flake-utils": "flake-utils",
|
||||
"git-hooks": "git-hooks",
|
||||
"flake-parts": "flake-parts",
|
||||
"gnome-shell": "gnome-shell",
|
||||
"home-manager": "home-manager_2",
|
||||
"nixpkgs": "nixpkgs_3",
|
||||
"nur": "nur",
|
||||
"systems": "systems",
|
||||
@@ -378,15 +275,16 @@
|
||||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1742997483,
|
||||
"narHash": "sha256-eDN1TAIj57ZTR8jsl63tdOdGebRdL7xE6Om0r0LZd5s=",
|
||||
"lastModified": 1769472288,
|
||||
"narHash": "sha256-RdnbroWsujYh1MaMhDpP5QM+bRIGG6smz987v1fli+U=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "daef51e92086a5b4d6a7756ad495dfd34353b7cb",
|
||||
"rev": "c2c4a3ad52c096db1c8dde97d3d21451613f000c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "danth",
|
||||
"ref": "release-25.11",
|
||||
"repo": "stylix",
|
||||
"type": "github"
|
||||
}
|
||||
@@ -426,28 +324,27 @@
|
||||
"tinted-kitty": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1716423189,
|
||||
"narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
|
||||
"lastModified": 1735730497,
|
||||
"narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-kitty",
|
||||
"rev": "eb39e141db14baef052893285df9f266df041ff8",
|
||||
"rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-kitty",
|
||||
"rev": "eb39e141db14baef052893285df9f266df041ff8",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"tinted-schemes": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1741468895,
|
||||
"narHash": "sha256-YKM1RJbL68Yp2vESBqeZQBjTETXo8mCTTzLZyckCfZk=",
|
||||
"lastModified": 1767817087,
|
||||
"narHash": "sha256-eGE8OYoK6HzhJt/7bOiNV2cx01IdIrHL7gXgjkHRdNo=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "schemes",
|
||||
"rev": "47c8c7726e98069cade5827e5fb2bfee02ce6991",
|
||||
"rev": "bd99656235aab343e3d597bf196df9bc67429507",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -459,11 +356,11 @@
|
||||
"tinted-tmux": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1740877430,
|
||||
"narHash": "sha256-zWcCXgdC4/owfH/eEXx26y5BLzTrefjtSLFHWVD5KxU=",
|
||||
"lastModified": 1767489635,
|
||||
"narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-tmux",
|
||||
"rev": "d48ee86394cbe45b112ba23ab63e33656090edb4",
|
||||
"rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -475,11 +372,11 @@
|
||||
"tinted-zed": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1725758778,
|
||||
"narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
|
||||
"lastModified": 1767488740,
|
||||
"narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "base16-zed",
|
||||
"rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
|
||||
"rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -487,28 +384,6 @@
|
||||
"repo": "base16-zed",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"treefmt-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"stylix",
|
||||
"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"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
||||
10
flake.nix
10
flake.nix
@@ -2,10 +2,10 @@
|
||||
description = "Nixos config flake";
|
||||
|
||||
inputs = {
|
||||
stylix.url = "github:danth/stylix";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
home-manager.url = "github:nix-community/home-manager";
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||
stylix.url = "github:danth/stylix/release-25.11";
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||
home-manager.url = "github:nix-community/home-manager/release-25.11";
|
||||
nixos-hardware.url = "github:nixos/nixos-hardware/master";
|
||||
};
|
||||
|
||||
outputs = {
|
||||
@@ -26,7 +26,6 @@
|
||||
inputs.home-manager.nixosModules.default
|
||||
inputs.stylix.nixosModules.stylix
|
||||
nixos-hardware.nixosModules.lenovo-thinkpad-x13-yoga
|
||||
(import ./overlays/ollama.nix)
|
||||
];
|
||||
};
|
||||
|
||||
@@ -45,7 +44,6 @@
|
||||
./hosts/server/configuration.nix
|
||||
inputs.home-manager.nixosModules.default
|
||||
nixos-hardware.nixosModules.system76
|
||||
(import ./overlays/ollama.nix)
|
||||
];
|
||||
};
|
||||
|
||||
|
||||
@@ -14,6 +14,14 @@
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
hardware.amdgpu.opencl.enable = true;
|
||||
boot.kernelParams = [ "amdgpu.ppfeaturemask=0xfff7ffff" "amdgpu.gpu_recovery=1" ];
|
||||
services.openssh = {enable = true;};
|
||||
|
||||
virtualisation.docker.enable = true;
|
||||
virtualisation.docker.storageDriver = "btrfs";
|
||||
|
||||
|
||||
networking = {
|
||||
hostName = "desktop";
|
||||
networkmanager.enable = true;
|
||||
@@ -24,35 +32,35 @@
|
||||
gc.automatic = true;
|
||||
settings = {
|
||||
experimental-features = ["nix-command" "flakes"];
|
||||
substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"];
|
||||
trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="];
|
||||
};
|
||||
};
|
||||
|
||||
services = {
|
||||
pipewire = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
jack.enable = true;
|
||||
};
|
||||
wivrn = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
defaultRuntime = true;
|
||||
autoStart = true;
|
||||
};
|
||||
xserver.enable = true;
|
||||
displayManager.sddm.enable = true;
|
||||
desktopManager.plasma6.enable = true;
|
||||
xserver = {
|
||||
enable = false;
|
||||
displayManager.gdm.enable = false;
|
||||
desktopManager.gnome.enable = false;
|
||||
};
|
||||
};
|
||||
|
||||
stylix = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
autoEnable = true;
|
||||
polarity = "dark";
|
||||
polarity = "light";
|
||||
image = ../laptop/wallpaper.png;
|
||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/everforest.yaml";
|
||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/precious-light-warm.yaml";
|
||||
opacity = {
|
||||
terminal = 0.85;
|
||||
popups = 0.75;
|
||||
@@ -65,17 +73,17 @@
|
||||
};
|
||||
fonts = {
|
||||
serif = {
|
||||
package = pkgs.nerdfonts;
|
||||
package = pkgs.nerd-fonts.iosevka;
|
||||
name = "Iosevka NF";
|
||||
};
|
||||
|
||||
sansSerif = {
|
||||
package = pkgs.nerdfonts;
|
||||
package = pkgs.nerd-fonts.iosevka;
|
||||
name = "Iosevka NF";
|
||||
};
|
||||
|
||||
monospace = {
|
||||
package = pkgs.nerdfonts;
|
||||
package = pkgs.nerd-fonts.iosevka;
|
||||
name = "Iosevka NFM";
|
||||
};
|
||||
};
|
||||
@@ -96,22 +104,22 @@
|
||||
};
|
||||
};
|
||||
|
||||
hardware = {
|
||||
graphics.enable32Bit = true;
|
||||
};
|
||||
#hardware = {
|
||||
# graphics.enable32Bit = true;
|
||||
#};
|
||||
|
||||
programs = {
|
||||
zsh.enable = true;
|
||||
steam.enable = true;
|
||||
gamescope.enable = true;
|
||||
envision.enable = true;
|
||||
corectrl.enable = true;
|
||||
steam.enable = false;
|
||||
gamescope.enable = false;
|
||||
envision.enable = false;
|
||||
corectrl.enable = false;
|
||||
};
|
||||
|
||||
users.users.k = {
|
||||
isNormalUser = true;
|
||||
description = "k";
|
||||
extraGroups = ["networkmanager" "wheel"];
|
||||
extraGroups = ["networkmanager" "wheel" "docker"];
|
||||
packages = with pkgs; [zsh];
|
||||
shell = pkgs.zsh;
|
||||
};
|
||||
|
||||
@@ -1,34 +1,29 @@
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
config,
|
||||
lib,
|
||||
pkgs,
|
||||
modulesPath,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
imports =
|
||||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-amd"];
|
||||
boot.extraModulePackages = [];
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/aace1ae9-2a8f-4a90-9e0b-cb21779636d2";
|
||||
fsType = "btrfs";
|
||||
};
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-label/nixos";
|
||||
fsType = "btrfs";
|
||||
};
|
||||
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/8D75-F095";
|
||||
fsType = "vfat";
|
||||
options = ["fmask=0022" "dmask=0022"];
|
||||
};
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/BB87-CC45";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices = [];
|
||||
swapDevices = [ ];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
|
||||
@@ -6,42 +6,42 @@
|
||||
}: {
|
||||
imports = [../home/home_common.nix];
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
home = {
|
||||
packages = with pkgs; [
|
||||
steam
|
||||
neovim
|
||||
firefox
|
||||
wivrn
|
||||
opencomposite
|
||||
wlx-overlay-s
|
||||
glslang
|
||||
gst_all_1.gstreamer
|
||||
libdrm
|
||||
openxr-loader
|
||||
khronos-ocl-icd-loader
|
||||
];
|
||||
};
|
||||
#home = {
|
||||
# packages = with pkgs; [
|
||||
# steam
|
||||
# neovim
|
||||
# firefox
|
||||
# wivrn
|
||||
# opencomposite
|
||||
# wlx-overlay-s
|
||||
# glslang
|
||||
# gst_all_1.gstreamer
|
||||
# libdrm
|
||||
# openxr-loader
|
||||
# khronos-ocl-icd-loader
|
||||
# ];
|
||||
#};
|
||||
|
||||
# For WiVRn:
|
||||
xdg.configFile."openxr/1/active_runtime.json".source = "${pkgs.wivrn}/share/openxr/1/openxr_wivrn.json";
|
||||
#xdg.configFile."openxr/1/active_runtime.json".source = "${pkgs.wivrn}/share/openxr/1/openxr_wivrn.json";
|
||||
|
||||
xdg.configFile."openvr/openvrpaths.vrpath".text = ''
|
||||
{
|
||||
"config" :
|
||||
[
|
||||
"${config.xdg.dataHome}/Steam/config"
|
||||
],
|
||||
"external_drivers" : null,
|
||||
"jsonid" : "vrpathreg",
|
||||
"log" :
|
||||
[
|
||||
"${config.xdg.dataHome}/Steam/logs"
|
||||
],
|
||||
"runtime" :
|
||||
[
|
||||
"${pkgs.opencomposite}/lib/opencomposite"
|
||||
],
|
||||
"version" : 1
|
||||
}
|
||||
'';
|
||||
#xdg.configFile."openvr/openvrpaths.vrpath".text = ''
|
||||
# {
|
||||
# "config" :
|
||||
# [
|
||||
# "${config.xdg.dataHome}/Steam/config"
|
||||
# ],
|
||||
# "external_drivers" : null,
|
||||
# "jsonid" : "vrpathreg",
|
||||
# "log" :
|
||||
# [
|
||||
# "${config.xdg.dataHome}/Steam/logs"
|
||||
# ],
|
||||
# "runtime" :
|
||||
# [
|
||||
# "${pkgs.opencomposite}/lib/opencomposite"
|
||||
# ],
|
||||
# "version" : 1
|
||||
# }
|
||||
#'';
|
||||
}
|
||||
|
||||
@@ -17,40 +17,24 @@
|
||||
};
|
||||
tmux.enable = true;
|
||||
starship.enable = true;
|
||||
nushell = {
|
||||
zsh = {
|
||||
enable = true;
|
||||
shellAliases = {
|
||||
cat = "bat";
|
||||
};
|
||||
extraConfig = ''
|
||||
$env.config = {
|
||||
show_banner: false,
|
||||
autosuggestion.enable = true;
|
||||
enableCompletion = true;
|
||||
syntaxHighlighting.enable = true;
|
||||
autocd = true;
|
||||
plugins = [
|
||||
{
|
||||
name = "zsh-nix-shell";
|
||||
file = "nix-shell.plugin.zsh";
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "chisui";
|
||||
repo = "zsh-nix-shell";
|
||||
rev = "v0.8.0";
|
||||
sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
|
||||
};
|
||||
}
|
||||
'';
|
||||
];
|
||||
};
|
||||
carapace = {
|
||||
enable = true;
|
||||
enableNushellIntegration = true;
|
||||
};
|
||||
bat.enable = true;
|
||||
# zsh = {
|
||||
# enable = true;
|
||||
# autosuggestion.enable = true;
|
||||
# enableCompletion = true;
|
||||
# syntaxHighlighting.enable = true;
|
||||
# autocd = true;
|
||||
# plugins = [
|
||||
# {
|
||||
# name = "zsh-nix-shell";
|
||||
# file = "nix-shell.plugin.zsh";
|
||||
# src = pkgs.fetchFromGitHub {
|
||||
# owner = "chisui";
|
||||
# repo = "zsh-nix-shell";
|
||||
# rev = "v0.8.0";
|
||||
# sha256 = "1lzrn0n4fxfcgg65v0qhnj7wnybybqzs4adz7xsrkgmcsr0ii8b7";
|
||||
# };
|
||||
# }
|
||||
# ];
|
||||
# };
|
||||
};
|
||||
}
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
}: {
|
||||
imports = [./waybar.nix ./tile.nix];
|
||||
home.packages = with pkgs; [
|
||||
iio-hyprland
|
||||
jq #iio-hyprland needs this
|
||||
#iio-hyprland
|
||||
#jq #iio-hyprland needs this
|
||||
];
|
||||
|
||||
programs = {
|
||||
@@ -50,8 +50,10 @@
|
||||
|
||||
settings = {
|
||||
exec-once = [
|
||||
"${pkgs.iio-hyprland}/bin/iio-hyprland"
|
||||
#"${pkgs.iio-hyprland}/bin/iio-hyprland"
|
||||
"${pkgs.batsignal}/bin/batsignal -n BAT0 -b"
|
||||
"${pkgs.waybar}/bin/waybar"
|
||||
"${pkgs.hyprpaper}/bin/hyprpaper"
|
||||
];
|
||||
monitor = "eDP-1,preferred,auto,1";
|
||||
general = {
|
||||
@@ -97,9 +99,16 @@
|
||||
"$mainMod, Return, exec, $terminal"
|
||||
"$mainMod, D, exec, $menu"
|
||||
"$mainMod Shift, C, killactive,"
|
||||
"$mainMod, Space, exec, toggle_float"
|
||||
"$mainMod, Space, togglefloating"
|
||||
"$mainMod, Escape, exec, ${pkgs.hyprlock}/bin/hyprlock"
|
||||
|
||||
#emacs
|
||||
"$mainMod, E, exec, ${pkgs.emacs-pgtk}/bin/emacsclient -c"
|
||||
"$mainMod, C, exec, ${pkgs.emacs-pgtk}/bin/emacsclient -c -e\ \"(org-roam-capture)\""
|
||||
"$mainMod, B, exec, ${pkgs.emacs-pgtk}/bin/emacsclient -c -e\ \"(call-interactively #'bookmark-jump)\""
|
||||
"$mainMod, P, exec, ${pkgs.emacs-pgtk}/bin/emacsclient -c -e\ \"(project-dired)\""
|
||||
"$mainMod, M, exec, ${pkgs.emacs-pgtk}/bin/emacsclient -c -e \"(mingus)\""
|
||||
|
||||
# switch focus
|
||||
"$mainMod, left, movefocus, l"
|
||||
"$mainMod, right, movefocus, r"
|
||||
@@ -160,10 +169,6 @@
|
||||
"$mainMod, mouse:272, movewindow"
|
||||
"$mainMod, mouse:273, resizewindow"
|
||||
];
|
||||
|
||||
windowrule = ["float,mpv" "center,mpv" "pin,wofi" "idleinhibit focus,mpv"];
|
||||
|
||||
windowrulev2 = [];
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
17
hosts/home/niri.nix
Normal file
17
hosts/home/niri.nix
Normal file
@@ -0,0 +1,17 @@
|
||||
{
|
||||
config,
|
||||
pkgs,
|
||||
inputs,
|
||||
...
|
||||
}: {
|
||||
imports = [./waybar.nix ./tile.nix];
|
||||
home.packages = with pkgs; [
|
||||
pkgs.swaybg
|
||||
pkgs.swayidle
|
||||
pkgs.swaylock
|
||||
pkgs.niri
|
||||
pkgs.fuzzel
|
||||
pkgs.iio-niri
|
||||
pkgs.squeekboard
|
||||
];
|
||||
}
|
||||
@@ -14,7 +14,7 @@
|
||||
alacritty = {enable = true;};
|
||||
wofi = {enable = true;};
|
||||
zathura = {enable = true;};
|
||||
#mpv = {enable = true;};
|
||||
mpv = {enable = true;};
|
||||
lf = {enable = true;};
|
||||
};
|
||||
home.packages = with pkgs; [
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
margin-right = 45;
|
||||
spacing = 15;
|
||||
|
||||
modules-left = ["sway/workspaces" "sway/mode"];
|
||||
modules-left = ["sway/workspaces" "sway/mode" "hyprland/window"];
|
||||
modules-center = ["clock"];
|
||||
modules-right = ["pulseaudio" "network" "battery"];
|
||||
|
||||
|
||||
@@ -24,11 +24,11 @@
|
||||
};
|
||||
|
||||
nix = {
|
||||
gc.automatic = true;
|
||||
gc.automatic = false;
|
||||
settings = {
|
||||
experimental-features = ["nix-command" "flakes"];
|
||||
substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"];
|
||||
trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="];
|
||||
#substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"];
|
||||
#trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -38,23 +38,21 @@
|
||||
firewall.enable = true;
|
||||
};
|
||||
|
||||
i18n = {
|
||||
defaultLocale = "en_US.UTF-8";
|
||||
extraLocaleSettings = {
|
||||
LC_ADDRESS = "en_US.UTF-8";
|
||||
LC_IDENTIFICATION = "en_US.UTF-8";
|
||||
LC_MEASUREMENT = "en_US.UTF-8";
|
||||
LC_MONETARY = "en_US.UTF-8";
|
||||
LC_NAME = "en_US.UTF-8";
|
||||
LC_NUMERIC = "en_US.UTF-8";
|
||||
LC_PAPER = "en_US.UTF-8";
|
||||
LC_TELEPHONE = "en_US.UTF-8";
|
||||
LC_TIME = "en_US.UTF-8";
|
||||
};
|
||||
};
|
||||
i18n.defaultLocale = "en_US.UTF-8";
|
||||
|
||||
services = {
|
||||
hardware.bolt = {enable = true;};
|
||||
displayManager.ly = {
|
||||
enable = true;
|
||||
x11Support = false;
|
||||
settings = {
|
||||
animation = "colormix";
|
||||
battery_id = "BAT0";
|
||||
clear_password = true;
|
||||
colormix_col1 = "0xffffea";
|
||||
colormix_col2 = "0x006600";
|
||||
colormix_col3 = "0x8888cc";
|
||||
};
|
||||
};
|
||||
pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
@@ -62,27 +60,25 @@
|
||||
pulse.enable = true;
|
||||
jack.enable = true;
|
||||
};
|
||||
ollama = {
|
||||
auto-cpufreq = {
|
||||
enable = true;
|
||||
package = pkgs.ollama-intel;
|
||||
settings = {
|
||||
battery = {
|
||||
governor = "powersave";
|
||||
turbo = "never";
|
||||
};
|
||||
charger = {
|
||||
governor = "balance_performance";
|
||||
turbo = "auto";
|
||||
};
|
||||
};
|
||||
};
|
||||
# auto-cpufreq = {
|
||||
# enable = true;
|
||||
# settings = {
|
||||
# battery = {
|
||||
# governor = "powersave";
|
||||
# turbo = "never";
|
||||
# };
|
||||
# charger = {
|
||||
# governor = "balance_performance";
|
||||
# turbo = "auto";
|
||||
# };
|
||||
# };
|
||||
#};
|
||||
logind = {
|
||||
lidSwitch = "suspend-then-hibernate";
|
||||
lidSwitchExternalPower = "suspend";
|
||||
};
|
||||
|
||||
hardware.bolt.enable = true;
|
||||
blueman.enable = true;
|
||||
fwupd.enable = true;
|
||||
printing.enable = true;
|
||||
@@ -93,13 +89,33 @@
|
||||
stylix = {
|
||||
enable = true;
|
||||
autoEnable = true;
|
||||
polarity = "dark";
|
||||
polarity = "light";
|
||||
image = ./wallpaper.png;
|
||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/everforest.yaml";
|
||||
base16Scheme = {
|
||||
base00 = "#ffffea";
|
||||
base01 = "#eaffff";
|
||||
base02 = "#eeee9e";
|
||||
base03 = "#99994c";
|
||||
base04 = "#555555";
|
||||
base05 = "#000000";
|
||||
base06 = "#000000";
|
||||
base07 = "#000000";
|
||||
base08 = "#aa0000";
|
||||
base09 = "#884400";
|
||||
base0A = "#99994c";
|
||||
base0B = "#006600";
|
||||
base0C = "#8888cc";
|
||||
base0D = "#000099";
|
||||
base0E = "#8888cc";
|
||||
base0F = "#5d3a1a";
|
||||
};
|
||||
targets.chromium.enable = false;
|
||||
targets.gnome.enable = false;
|
||||
opacity = {
|
||||
terminal = 0.85;
|
||||
popups = 0.75;
|
||||
desktop = 0.75;
|
||||
applications = 0.85;
|
||||
};
|
||||
cursor = {
|
||||
package = pkgs.adwaita-icon-theme;
|
||||
@@ -126,35 +142,23 @@
|
||||
|
||||
hardware = {
|
||||
sensor.iio.enable = true;
|
||||
graphics.enable32Bit = true;
|
||||
graphics.extraPackages = with pkgs; [
|
||||
intel-vaapi-driver
|
||||
intel-media-driver
|
||||
intel-compute-runtime
|
||||
];
|
||||
};
|
||||
|
||||
virtualisation.podman = {
|
||||
enable = true;
|
||||
dockerCompat = true;
|
||||
};
|
||||
|
||||
programs = {
|
||||
zsh.enable = true;
|
||||
regreet.enable = true;
|
||||
hyprlock.enable = true;
|
||||
hyprland = {
|
||||
enable = true;
|
||||
withUWSM = true;
|
||||
};
|
||||
niri.enable = true;
|
||||
};
|
||||
|
||||
virtualisation = {
|
||||
docker = {enable = true;};
|
||||
};
|
||||
|
||||
users.users.k = {
|
||||
isNormalUser = true;
|
||||
description = "k";
|
||||
extraGroups = ["networkmanager" "wheel"];
|
||||
packages = with pkgs; [nushell];
|
||||
shell = pkgs.nushell;
|
||||
extraGroups = ["networkmanager" "wheel" "cdrom" "libvirtd"];
|
||||
packages = with pkgs; [zsh];
|
||||
shell = pkgs.zsh;
|
||||
};
|
||||
|
||||
home-manager = {
|
||||
@@ -165,11 +169,12 @@
|
||||
environment = {
|
||||
sessionVariables = {MOZ_USE_XINPUT2 = "1";};
|
||||
systemPackages = with pkgs; [
|
||||
config.boot.kernelPackages.perf
|
||||
];
|
||||
};
|
||||
|
||||
systemd.sleep.extraConfig = ''
|
||||
HibernateDelaySec=30m
|
||||
HibernateDelaySec=20m
|
||||
SuspendState=mem
|
||||
'';
|
||||
|
||||
@@ -185,7 +190,6 @@
|
||||
"loglevel=3"
|
||||
"rd.systemd.show_status=false"
|
||||
"rd.udev.log_level=3"
|
||||
"udev.log_priority=3"
|
||||
];
|
||||
loader.timeout = 0;
|
||||
};
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
}: {
|
||||
imports = [
|
||||
../home/home_common.nix
|
||||
../home/hyprland.nix
|
||||
../home/niri.nix
|
||||
];
|
||||
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
@@ -14,19 +14,27 @@
|
||||
home = {
|
||||
packages = with pkgs; [
|
||||
firefox
|
||||
lagrange
|
||||
chromium #this might replace firefox
|
||||
keepassxc
|
||||
thunderbird
|
||||
blender
|
||||
vesktop
|
||||
spotify
|
||||
alacritty
|
||||
|
||||
btop
|
||||
zip
|
||||
emacs-gtk
|
||||
|
||||
prismlauncher
|
||||
steam
|
||||
gamescope
|
||||
|
||||
direnv
|
||||
texliveFull
|
||||
ispell
|
||||
|
||||
calc
|
||||
];
|
||||
};
|
||||
|
||||
@@ -36,6 +44,17 @@
|
||||
enableZshIntegration = true;
|
||||
nix-direnv.enable = true;
|
||||
};
|
||||
|
||||
emacs = {
|
||||
enable = true;
|
||||
package = pkgs.emacs-pgtk.override {
|
||||
withTreeSitter = true;
|
||||
withNativeCompilation = true;
|
||||
};
|
||||
extraPackages = epkgs: [
|
||||
epkgs.vterm
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
services = {
|
||||
@@ -45,14 +64,15 @@
|
||||
enable = true;
|
||||
musicDirectory = "/home/k/Music";
|
||||
};
|
||||
|
||||
emacs = {
|
||||
enable = true;
|
||||
defaultEditor = true;
|
||||
package = pkgs.emacs-gtk;
|
||||
};
|
||||
};
|
||||
stylix = {
|
||||
enable = true;
|
||||
autoEnable = true;
|
||||
targets.gnome.enable = false;
|
||||
};
|
||||
}
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 3.3 MiB After Width: | Height: | Size: 2.1 MiB |
@@ -13,8 +13,8 @@
|
||||
gc.automatic = true;
|
||||
settings = {
|
||||
experimental-features = ["nix-command" "flakes"];
|
||||
substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"];
|
||||
trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="];
|
||||
#substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"];
|
||||
#trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="];
|
||||
};
|
||||
};
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
|
||||
users = {
|
||||
motd = "Welcome to the Server";
|
||||
defaultUserShell = pkgs.nushell;
|
||||
defaultUserShell = pkgs.zsh;
|
||||
users = {
|
||||
k = {
|
||||
isNormalUser = true;
|
||||
@@ -48,9 +48,15 @@
|
||||
};
|
||||
};
|
||||
|
||||
home-manager = {users = {"k" = import ./home.nix;};};
|
||||
home-manager = {
|
||||
backupFileExtension = "bk";
|
||||
users = {"k" = import ./home.nix;};
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [microcodeIntel];
|
||||
environment.systemPackages = with pkgs; [
|
||||
microcodeIntel
|
||||
firefox
|
||||
];
|
||||
|
||||
hardware.bluetooth.enable = true;
|
||||
hardware.bluetooth.powerOnBoot = true;
|
||||
|
||||
@@ -5,5 +5,8 @@
|
||||
...
|
||||
}: {
|
||||
imports = [../home/home_common.nix];
|
||||
home = {packages = with pkgs; [docker docker-compose neovim];};
|
||||
home = {packages = with pkgs; [docker docker-compose neovim waypipe];};
|
||||
services = {
|
||||
syncthing.enable = true;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -3,12 +3,38 @@
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
networking.firewall = {
|
||||
enable = true;
|
||||
allowedTCPPorts = [80 443 22];
|
||||
allowedUDPPorts = [];
|
||||
networking = {
|
||||
firewall = {
|
||||
enable = true;
|
||||
allowedTCPPorts = [80 443 22 25565 26615 8080 53 19132];
|
||||
allowedUDPPorts = [26615 8080 1900 51820 53 19132];
|
||||
};
|
||||
nat.externalInterface = "wlp0s20f3";
|
||||
nat.internalInterfaces = ["wg0"];
|
||||
wireguard.interfaces = {
|
||||
wg0 = {
|
||||
ips = ["10.0.0.1/24"];
|
||||
listenPort = 51820;
|
||||
privateKeyFile = "/keys/wg-private";
|
||||
peers = [
|
||||
{
|
||||
# laptop
|
||||
publicKey = "Ze2y3K+blI3aBc1AKTlvv90j+McBaitB+qSLazsuSFM=";
|
||||
allowedIPs = ["10.0.0.2/32"];
|
||||
}
|
||||
|
||||
{
|
||||
# phone
|
||||
publicKey = "vcheBoHRxCrwzbMw0UI9ZsQfVDJizBWkeM+pF5/8+HE=";
|
||||
allowedIPs = ["10.0.0.3/32"];
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
networking.nat.enable = true;
|
||||
|
||||
security.acme = {
|
||||
acceptTerms = true;
|
||||
defaults.email = "markers711@gmail.com";
|
||||
@@ -37,7 +63,7 @@
|
||||
};
|
||||
|
||||
ollama = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
package = pkgs.ollama-intel;
|
||||
};
|
||||
|
||||
@@ -70,8 +96,8 @@
|
||||
};
|
||||
|
||||
home-assistant = {
|
||||
enable = true;
|
||||
extraComponents = ["wiz" "fail2ban" "ollama" "wyoming"];
|
||||
enable = false;
|
||||
extraComponents = ["wiz" "fail2ban" "ollama" "wyoming" "androidtv" "androidtv_remote"];
|
||||
config = {
|
||||
default_config = {};
|
||||
"automation ui" = "!include automations.yaml";
|
||||
@@ -85,12 +111,12 @@
|
||||
|
||||
wyoming = {
|
||||
piper.servers."piperNix" = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
uri = "tcp://0.0.0.0:10200";
|
||||
voice = "en-us-ryan-low";
|
||||
};
|
||||
faster-whisper.servers."whisperNix" = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
uri = "tcp://0.0.0.0:10300";
|
||||
language = "en";
|
||||
};
|
||||
@@ -173,6 +199,15 @@
|
||||
};
|
||||
};
|
||||
|
||||
"map.dhilton.xyz" = {
|
||||
forceSSL = true;
|
||||
enableACME = true;
|
||||
locations."/" = {
|
||||
proxyPass = "http://127.0.0.1:8100";
|
||||
proxyWebsockets = true;
|
||||
};
|
||||
};
|
||||
|
||||
"nix.dhilton.xyz" = {
|
||||
locations."/".proxyPass = "http://127.0.0.1:5000";
|
||||
};
|
||||
|
||||
@@ -29,16 +29,19 @@
|
||||
postInstall =
|
||||
(oldAttrs.postInstall or "")
|
||||
+ ''
|
||||
mkdir -p "$out/bin"
|
||||
cat << EOF > "$out/bin/ollama-wrapped"
|
||||
#!/bin/sh
|
||||
export LD_LIBRARY_PATH="${prev.intel-compute-runtime.drivers}/lib"
|
||||
export OLLAMA_INTEL_GPU=1
|
||||
exec "$out/bin/ollama-base" "\$@"
|
||||
EOF
|
||||
chmod +x "$out/bin/ollama-wrapped"
|
||||
mv $out/bin/ollama $out/bin/ollama-base
|
||||
ln -s "$out/bin/ollama-wrapped" "$out/bin/ollama"
|
||||
mkdir -p "$out/bin"
|
||||
cat << EOF > "$out/bin/ollama-wrapped"
|
||||
#!/bin/sh
|
||||
export LD_LIBRARY_PATH="${prev.intel-compute-runtime.drivers}/lib"
|
||||
export OLLAMA_INTEL_GPU=1
|
||||
export OLLAMA_NUM_GPU=999
|
||||
export ZES_ENABLE_SYSMAN=1
|
||||
export SYCL_CACHE_PERSISTENT=1
|
||||
exec "$out/bin/ollama-base" "\$@"
|
||||
EOF
|
||||
chmod +x "$out/bin/ollama-wrapped"
|
||||
mv $out/bin/ollama $out/bin/ollama-base
|
||||
ln -s "$out/bin/ollama-wrapped" "$out/bin/ollama"
|
||||
'';
|
||||
});
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user