Compare commits

..

34 Commits

Author SHA1 Message Date
k
6b669988f0 clean up
Some checks failed
Verify Nix Flake / verify_build (push) Failing after 56s
2026-01-28 01:02:43 -05:00
k
ae74da869a update flake 2026-01-28 01:02:43 -05:00
k
f8eccabdb3 Updated formating 2026-01-28 01:02:43 -05:00
k
07fd3a6afc Changed colors 2026-01-28 01:02:43 -05:00
k
64e97bd330 Changed to niri 2026-01-28 01:02:43 -05:00
k
52569da057 Merge branch 'master' of https://git.dhilton.xyz/k/nixos_configs
Some checks failed
Verify Nix Flake / verify_build (push) Failing after 1m11s
2025-12-20 02:34:03 +00:00
k
b7ff106a25 disabled homeassistent 2025-12-20 02:33:57 +00:00
k
ecd325b830 removed unimportant packages
Some checks failed
Verify Nix Flake / verify_build (push) Failing after 1m1s
2025-12-15 21:05:54 +00:00
k
52e7d921d6 Merge branch 'master' of https://git.dhilton.xyz/k/nixos_configs 2025-12-13 19:05:33 +00:00
k
567f8ca405 add docker 2025-12-13 19:05:29 +00:00
k
4f5a315521 added some emacs bindings
Some checks failed
Verify Nix Flake / verify_build (push) Failing after 1m2s
2025-12-10 00:27:49 -05:00
k
a6496a874d switched to hyprland 2025-12-09 23:09:31 -05:00
k
7fea267494 changed style 2025-12-09 23:09:03 -05:00
k
d668ea2616 update to 25.11 2025-12-09 23:08:03 -05:00
k
0fc551c8c5 update
All checks were successful
Verify Nix Flake / verify_build (push) Successful in 1m42s
2025-12-03 12:40:13 -05:00
k
f17f1de522 spesify more emacs 2025-12-03 12:40:13 -05:00
k
c78505aa09 enable virt 2025-12-03 12:40:13 -05:00
k
3cd724436b useing gnome 2025-12-03 12:40:13 -05:00
k
c183a0a551 Merge branch 'master' of https://git.dhilton.xyz/k/nixos_configs
Some checks failed
Verify Nix Flake / verify_build (push) Has been cancelled
2025-12-03 17:38:52 +00:00
k
c0a1f5495f current config 2025-12-03 17:38:31 +00:00
k
5996a33269 Merge branch 'master' of https://git.dhilton.xyz/k/nixos_configs
All checks were successful
Verify Nix Flake / verify_build (push) Successful in 1m53s
2025-10-15 05:08:46 +00:00
k
51045c91d6 disabled ui 2025-10-15 05:08:18 +00:00
k
0a2fb9609c Merge branch 'master' of https://git.dhilton.xyz/k/nixos_configs
All checks were successful
Verify Nix Flake / verify_build (push) Successful in 1m23s
2025-07-30 17:55:42 +00:00
k
b121b0e556 added android tv to home mgr 2025-07-30 17:53:00 +00:00
k
48ed783db5 updated flake
All checks were successful
Verify Nix Flake / verify_build (push) Successful in 1m12s
2025-07-30 17:51:01 +00:00
k
dd4a2adcfd fixed dektop 2025-07-30 17:50:50 +00:00
k
6c6af12ef6 clean up
Some checks failed
Verify Nix Flake / verify_build (push) Failing after 50s
2025-07-13 10:35:02 -04:00
k
fd2e474229 added kodi 2025-07-13 10:33:52 -04:00
k
70cc2587aa added cockpit 2025-07-13 10:32:20 -04:00
k
80c6d1bfe2 tweeked ollama 2025-07-13 10:29:55 -04:00
k
a9a6518dee update nix flake
Some checks failed
Verify Nix Flake / verify_build (push) Failing after 57s
2025-07-12 17:05:33 -04:00
k
1cafcc70b5 testing chrome insted of firefox 2025-07-12 17:02:24 -04:00
k
e4225a8156 cleanup 2025-07-12 16:54:59 -04:00
k
2b9c7d57ba switch to plasma 2025-07-12 16:47:24 -04:00
14 changed files with 295 additions and 365 deletions

228
flake.lock generated
View File

@@ -5,11 +5,11 @@
"fromYaml": "fromYaml" "fromYaml": "fromYaml"
}, },
"locked": { "locked": {
"lastModified": 1746562888, "lastModified": 1755819240,
"narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=", "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=",
"owner": "SenchoPens", "owner": "SenchoPens",
"repo": "base16.nix", "repo": "base16.nix",
"rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89", "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -21,27 +21,28 @@
"base16-fish": { "base16-fish": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1622559957, "lastModified": 1765809053,
"narHash": "sha256-PebymhVYbL8trDVVXxCvZgc0S5VxI7I1Hv4RMSquTpA=", "narHash": "sha256-XCUQLoLfBJ8saWms2HCIj4NEN+xNsWBlU1NrEPcQG4s=",
"owner": "tomyun", "owner": "tomyun",
"repo": "base16-fish", "repo": "base16-fish",
"rev": "2f6dd973a9075dabccd26f1cded09508180bf5fe", "rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "tomyun", "owner": "tomyun",
"repo": "base16-fish", "repo": "base16-fish",
"rev": "86cbea4dca62e08fb7fd83a70e96472f92574782",
"type": "github" "type": "github"
} }
}, },
"base16-helix": { "base16-helix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1736852337, "lastModified": 1760703920,
"narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-helix", "repo": "base16-helix",
"rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", "rev": "d646af9b7d14bff08824538164af99d0c521b185",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -70,11 +71,11 @@
"firefox-gnome-theme": { "firefox-gnome-theme": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1744642301, "lastModified": 1764873433,
"narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", "narHash": "sha256-1XPewtGMi+9wN9Ispoluxunw/RwozuTRVuuQOmxzt+A=",
"owner": "rafaelmardojai", "owner": "rafaelmardojai",
"repo": "firefox-gnome-theme", "repo": "firefox-gnome-theme",
"rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", "rev": "f7ffd917ac0d253dbd6a3bf3da06888f57c69f92",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -83,21 +84,6 @@
"type": "github" "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": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@@ -106,11 +92,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733312601, "lastModified": 1767609335,
"narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "narHash": "sha256-feveD98mQpptwrAEggBQKJTYbvwwglSbOv53uCfH9PY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "rev": "250481aafeb741edfe23d29195671c19b36b6dca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -135,69 +121,23 @@
"type": "github" "type": "github"
} }
}, },
"git-hooks": {
"inputs": {
"flake-compat": [
"stylix",
"flake-compat"
],
"gitignore": "gitignore",
"nixpkgs": [
"stylix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1742649964,
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
"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": { "gnome-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1744584021, "host": "gitlab.gnome.org",
"narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=", "lastModified": 1767737596,
"narHash": "sha256-eFujfIUQDgWnSJBablOuG+32hCai192yRdrNHTv0a+s=",
"owner": "GNOME", "owner": "GNOME",
"repo": "gnome-shell", "repo": "gnome-shell",
"rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae", "rev": "ef02db02bf0ff342734d525b5767814770d85b49",
"type": "github" "type": "gitlab"
}, },
"original": { "original": {
"host": "gitlab.gnome.org",
"owner": "GNOME", "owner": "GNOME",
"ref": "48.1", "ref": "gnome-49",
"repo": "gnome-shell", "repo": "gnome-shell",
"type": "github" "type": "gitlab"
} }
}, },
"home-manager": { "home-manager": {
@@ -205,49 +145,27 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1749154018, "lastModified": 1768949235,
"narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", "narHash": "sha256-TtjKgXyg1lMfh374w5uxutd6Vx2P/hU81aEhTxrO2cg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", "rev": "75ed713570ca17427119e7e204ab3590cc3bf2a5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-25.05", "ref": "release-25.11",
"repo": "home-manager",
"type": "github"
}
},
"home-manager_2": {
"inputs": {
"nixpkgs": [
"stylix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1747556831,
"narHash": "sha256-Qb84nbYFFk0DzFeqVoHltS2RodAYY5/HZQKE8WnBDsc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d0bbd221482c2713cccb80220f3c9d16a6e20a33",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-25.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1749195551, "lastModified": 1769302137,
"narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=", "narHash": "sha256-QEDtctEkOsbx8nlFh4yqPEOtr4tif6KTqWwJ37IM2ds=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "4602f7e1d3f197b3cb540d5accf5669121629628", "rev": "a351494b0e35fd7c0b7a1aae82f0afddf4907aa8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -259,48 +177,48 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1749024892, "lastModified": 1767799921,
"narHash": "sha256-OGcDEz60TXQC+gVz5sdtgGJdKVYr6rwdzQKuZAJQpCA=", "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8f1b52b04f2cb6e5ead50bd28d76528a2f0380ef", "rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1749086602, "lastModified": 1769318308,
"narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=", "narHash": "sha256-Mjx6p96Pkefks3+aA+72lu1xVehb6mv2yTUUqmSet6Q=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4792576cb003c994bd7cc1edada3129def20b27d", "rev": "1cd347bf3355fce6c64ab37d3967b4a2cb4b878c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1747610100, "lastModified": 1767799921,
"narHash": "sha256-rpR5ZPMkWzcnCcYYo3lScqfuzEw5Uyfh+R0EKZfroAc=", "narHash": "sha256-r4GVX+FToWVE2My8VVZH4V0pTIpnu2ZE8/Z4uxGEMBE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ca49c4304acf0973078db0a9d200fd2bae75676d", "rev": "d351d0653aeb7877273920cd3e823994e7579b0b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@@ -314,15 +232,14 @@
"nixpkgs": [ "nixpkgs": [
"stylix", "stylix",
"nixpkgs" "nixpkgs"
], ]
"treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1746056780, "lastModified": 1767886815,
"narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", "narHash": "sha256-pB2BBv6X9cVGydEV/9Y8+uGCvuYJAlsprs1v1QHjccA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "d476cd0972dd6242d76374fcc277e6735715c167", "rev": "4ff84374d77ff62e2e13a46c33bfeb73590f9fef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -346,11 +263,8 @@
"base16-helix": "base16-helix", "base16-helix": "base16-helix",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"firefox-gnome-theme": "firefox-gnome-theme", "firefox-gnome-theme": "firefox-gnome-theme",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"git-hooks": "git-hooks",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nur": "nur", "nur": "nur",
"systems": "systems", "systems": "systems",
@@ -361,16 +275,16 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1749238594, "lastModified": 1769472288,
"narHash": "sha256-pM5Mw81XTgMcrzw+br2ES/THEN1jrznEtWZ+SqnQAEY=", "narHash": "sha256-RdnbroWsujYh1MaMhDpP5QM+bRIGG6smz987v1fli+U=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "2759a42f9be7adf3ca09c7a6c3bf8b94d61fba84", "rev": "c2c4a3ad52c096db1c8dde97d3d21451613f000c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "danth", "owner": "danth",
"ref": "release-25.05", "ref": "release-25.11",
"repo": "stylix", "repo": "stylix",
"type": "github" "type": "github"
} }
@@ -426,11 +340,11 @@
"tinted-schemes": { "tinted-schemes": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1744974599, "lastModified": 1767817087,
"narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", "narHash": "sha256-eGE8OYoK6HzhJt/7bOiNV2cx01IdIrHL7gXgjkHRdNo=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "schemes", "repo": "schemes",
"rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", "rev": "bd99656235aab343e3d597bf196df9bc67429507",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -442,11 +356,11 @@
"tinted-tmux": { "tinted-tmux": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1745111349, "lastModified": 1767489635,
"narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", "narHash": "sha256-e6nnFnWXKBCJjCv4QG4bbcouJ6y3yeT70V9MofL32lU=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-tmux", "repo": "tinted-tmux",
"rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", "rev": "3c32729ccae99be44fe8a125d20be06f8d7d8184",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -458,11 +372,11 @@
"tinted-zed": { "tinted-zed": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1725758778, "lastModified": 1767488740,
"narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=", "narHash": "sha256-wVOj0qyil8m+ouSsVZcNjl5ZR+1GdOOAooAatQXHbuU=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-zed", "repo": "base16-zed",
"rev": "122c9e5c0e6f27211361a04fae92df97940eccf9", "rev": "11abb0b282ad3786a2aae088d3a01c60916f2e40",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -470,28 +384,6 @@
"repo": "base16-zed", "repo": "base16-zed",
"type": "github" "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", "root": "root",

View File

@@ -2,9 +2,9 @@
description = "Nixos config flake"; description = "Nixos config flake";
inputs = { inputs = {
stylix.url = "github:danth/stylix/release-25.05"; stylix.url = "github:danth/stylix/release-25.11";
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
home-manager.url = "github:nix-community/home-manager/release-25.05"; home-manager.url = "github:nix-community/home-manager/release-25.11";
nixos-hardware.url = "github:nixos/nixos-hardware/master"; nixos-hardware.url = "github:nixos/nixos-hardware/master";
}; };
@@ -26,7 +26,6 @@
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
inputs.stylix.nixosModules.stylix inputs.stylix.nixosModules.stylix
nixos-hardware.nixosModules.lenovo-thinkpad-x13-yoga nixos-hardware.nixosModules.lenovo-thinkpad-x13-yoga
(import ./overlays/ollama.nix)
]; ];
}; };
@@ -45,7 +44,6 @@
./hosts/server/configuration.nix ./hosts/server/configuration.nix
inputs.home-manager.nixosModules.default inputs.home-manager.nixosModules.default
nixos-hardware.nixosModules.system76 nixos-hardware.nixosModules.system76
(import ./overlays/ollama.nix)
]; ];
}; };

View File

@@ -13,16 +13,13 @@
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.kernelPatches = [
{ hardware.amdgpu.opencl.enable = true;
name = "amdgpu-ignore-ctx-privileges"; boot.kernelParams = [ "amdgpu.ppfeaturemask=0xfff7ffff" "amdgpu.gpu_recovery=1" ];
patch = pkgs.fetchpatch { services.openssh = {enable = true;};
name = "cap_sys_nice_begone.patch";
url = "https://github.com/Frogging-Family/community-patches/raw/master/linux61-tkg/cap_sys_nice_begone.mypatch"; virtualisation.docker.enable = true;
hash = "sha256-Y3a0+x2xvHsfLax/uwycdJf3xLxvVfkfDVqjkxNaYEo="; virtualisation.docker.storageDriver = "btrfs";
};
}
];
networking = { networking = {
@@ -40,26 +37,26 @@
services = { services = {
pipewire = { pipewire = {
enable = true; enable = false;
alsa.enable = true; alsa.enable = true;
alsa.support32Bit = true; alsa.support32Bit = true;
pulse.enable = true; pulse.enable = true;
jack.enable = true; jack.enable = true;
}; };
wivrn = { wivrn = {
enable = true; enable = false;
defaultRuntime = true; defaultRuntime = true;
autoStart = true; autoStart = true;
}; };
xserver = { xserver = {
enable = true; enable = false;
displayManager.gdm.enable = true; displayManager.gdm.enable = false;
desktopManager.gnome.enable = true; desktopManager.gnome.enable = false;
} };
}; };
stylix = { stylix = {
enable = true; enable = false;
autoEnable = true; autoEnable = true;
polarity = "light"; polarity = "light";
image = ../laptop/wallpaper.png; image = ../laptop/wallpaper.png;
@@ -107,22 +104,22 @@
}; };
}; };
hardware = { #hardware = {
graphics.enable32Bit = true; # graphics.enable32Bit = true;
}; #};
programs = { programs = {
zsh.enable = true; zsh.enable = true;
steam.enable = true; steam.enable = false;
gamescope.enable = true; gamescope.enable = false;
envision.enable = true; envision.enable = false;
corectrl.enable = true; corectrl.enable = false;
}; };
users.users.k = { users.users.k = {
isNormalUser = true; isNormalUser = true;
description = "k"; description = "k";
extraGroups = ["networkmanager" "wheel"]; extraGroups = ["networkmanager" "wheel" "docker"];
packages = with pkgs; [zsh]; packages = with pkgs; [zsh];
shell = pkgs.zsh; shell = pkgs.zsh;
}; };

View File

@@ -1,34 +1,29 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{ {
config, imports =
lib, [ (modulesPath + "/installer/scan/not-detected.nix")
pkgs,
modulesPath,
...
}: {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = []; boot.initrd.kernelModules = [ ];
boot.kernelModules = ["kvm-amd"]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = []; boot.extraModulePackages = [ ];
fileSystems."/" = { fileSystems."/" =
device = "/dev/disk/by-uuid/aace1ae9-2a8f-4a90-9e0b-cb21779636d2"; { device = "/dev/disk/by-label/nixos";
fsType = "btrfs"; fsType = "btrfs";
}; };
fileSystems."/boot" = { fileSystems."/boot" =
device = "/dev/disk/by-uuid/8D75-F095"; { device = "/dev/disk/by-uuid/BB87-CC45";
fsType = "vfat"; fsType = "vfat";
options = ["fmask=0022" "dmask=0022"];
}; };
swapDevices = []; swapDevices = [ ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # 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 # (the default) this is the recommended approach. When using systemd-networkd it's

View File

@@ -4,44 +4,44 @@
inputs, inputs,
... ...
}: { }: {
imports = [../home/home_common.nix ../home/gnone.nix]; imports = [../home/home_common.nix];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
home = { #home = {
packages = with pkgs; [ # packages = with pkgs; [
steam # steam
neovim # neovim
firefox # firefox
wivrn # wivrn
opencomposite # opencomposite
wlx-overlay-s # wlx-overlay-s
glslang # glslang
gst_all_1.gstreamer # gst_all_1.gstreamer
libdrm # libdrm
openxr-loader # openxr-loader
khronos-ocl-icd-loader # khronos-ocl-icd-loader
]; # ];
}; #};
# For WiVRn: # 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 = '' #xdg.configFile."openvr/openvrpaths.vrpath".text = ''
{ # {
"config" : # "config" :
[ # [
"${config.xdg.dataHome}/Steam/config" # "${config.xdg.dataHome}/Steam/config"
], # ],
"external_drivers" : null, # "external_drivers" : null,
"jsonid" : "vrpathreg", # "jsonid" : "vrpathreg",
"log" : # "log" :
[ # [
"${config.xdg.dataHome}/Steam/logs" # "${config.xdg.dataHome}/Steam/logs"
], # ],
"runtime" : # "runtime" :
[ # [
"${pkgs.opencomposite}/lib/opencomposite" # "${pkgs.opencomposite}/lib/opencomposite"
], # ],
"version" : 1 # "version" : 1
} # }
''; #'';
} }

View File

@@ -51,7 +51,9 @@
settings = { settings = {
exec-once = [ exec-once = [
#"${pkgs.iio-hyprland}/bin/iio-hyprland" #"${pkgs.iio-hyprland}/bin/iio-hyprland"
#"${pkgs.batsignal}/bin/batsignal -n BAT0 -b" "${pkgs.batsignal}/bin/batsignal -n BAT0 -b"
"${pkgs.waybar}/bin/waybar"
"${pkgs.hyprpaper}/bin/hyprpaper"
]; ];
monitor = "eDP-1,preferred,auto,1"; monitor = "eDP-1,preferred,auto,1";
general = { general = {
@@ -97,9 +99,16 @@
"$mainMod, Return, exec, $terminal" "$mainMod, Return, exec, $terminal"
"$mainMod, D, exec, $menu" "$mainMod, D, exec, $menu"
"$mainMod Shift, C, killactive," "$mainMod Shift, C, killactive,"
"$mainMod, Space, exec, toggle_float" "$mainMod, Space, togglefloating"
"$mainMod, Escape, exec, ${pkgs.hyprlock}/bin/hyprlock" "$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 # switch focus
"$mainMod, left, movefocus, l" "$mainMod, left, movefocus, l"
"$mainMod, right, movefocus, r" "$mainMod, right, movefocus, r"

17
hosts/home/niri.nix Normal file
View 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
];
}

View File

@@ -27,8 +27,8 @@
gc.automatic = false; gc.automatic = false;
settings = { settings = {
experimental-features = ["nix-command" "flakes"]; experimental-features = ["nix-command" "flakes"];
substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"]; #substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"];
trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="]; #trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="];
}; };
}; };
@@ -38,26 +38,20 @@
firewall.enable = true; firewall.enable = true;
}; };
i18n = { i18n.defaultLocale = "en_US.UTF-8";
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";
};
};
services = { services = {
hardware.bolt = {enable = false;}; displayManager.ly = {
xserver = { enable = true;
displayManager.gdm.enable = true; x11Support = false;
desktopManager.gnome.enable = true; settings = {
animation = "colormix";
battery_id = "BAT0";
clear_password = true;
colormix_col1 = "0xffffea";
colormix_col2 = "0x006600";
colormix_col3 = "0x8888cc";
};
}; };
pipewire = { pipewire = {
enable = true; enable = true;
@@ -66,12 +60,8 @@
pulse.enable = true; pulse.enable = true;
jack.enable = true; jack.enable = true;
}; };
ollama = {
enable = false;
package = pkgs.ollama-intel;
};
auto-cpufreq = { auto-cpufreq = {
enable = false; enable = true;
settings = { settings = {
battery = { battery = {
governor = "powersave"; governor = "powersave";
@@ -87,47 +77,45 @@
lidSwitch = "suspend-then-hibernate"; lidSwitch = "suspend-then-hibernate";
lidSwitchExternalPower = "suspend"; lidSwitchExternalPower = "suspend";
}; };
avahi = {
enable = true;
nssmdns4 = true;
openFirewall = true; # If you have a firewall enabled
};
hardware.bolt.enable = true;
blueman.enable = true; blueman.enable = true;
fwupd.enable = false; fwupd.enable = true;
printing.enable = true; printing.enable = true;
fprintd.enable = true; fprintd.enable = true;
thermald.enable = true; thermald.enable = true;
}; };
virtualisation.libvirtd = {
enable = true;
qemu = {
package = pkgs.qemu_kvm;
runAsRoot = true;
swtpm.enable = true;
ovmf = {
enable = true;
packages = [
(pkgs.OVMF.override {
secureBoot = true;
tpmSupport = true;
}).fd
];
};
};
};
stylix = { stylix = {
enable = true; enable = true;
autoEnable = true; autoEnable = true;
polarity = "light"; polarity = "light";
image = ./wallpaper.png; image = ./wallpaper.png;
base16Scheme = "${pkgs.base16-schemes}/share/themes/precious-light-warm.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 = { opacity = {
terminal = 0.85; terminal = 0.85;
popups = 0.75; popups = 0.75;
desktop = 0.75; desktop = 0.75;
applications = 0.85;
}; };
cursor = { cursor = {
package = pkgs.adwaita-icon-theme; package = pkgs.adwaita-icon-theme;
@@ -154,21 +142,15 @@
hardware = { hardware = {
sensor.iio.enable = true; 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 = { programs = {
zsh.enable = true; zsh.enable = true;
niri.enable = true;
};
virtualisation = {
docker = {enable = true;};
}; };
users.users.k = { users.users.k = {
@@ -187,26 +169,12 @@
environment = { environment = {
sessionVariables = {MOZ_USE_XINPUT2 = "1";}; sessionVariables = {MOZ_USE_XINPUT2 = "1";};
systemPackages = with pkgs; [ systemPackages = with pkgs; [
config.boot.kernelPackages.perf config.boot.kernelPackages.perf
]; ];
gnome.excludePackages = (with pkgs; [
atomix # puzzle game
cheese # webcam tool
epiphany # web browser
geary # email reader
gedit # text editor
gnome-characters
gnome-music
gnome-photos
gnome-tour
hitori # sudoku game
iagno # go game
tali # poker game
]);
}; };
systemd.sleep.extraConfig = '' systemd.sleep.extraConfig = ''
HibernateDelaySec=30m HibernateDelaySec=20m
SuspendState=mem SuspendState=mem
''; '';
@@ -222,7 +190,6 @@ config.boot.kernelPackages.perf
"loglevel=3" "loglevel=3"
"rd.systemd.show_status=false" "rd.systemd.show_status=false"
"rd.udev.log_level=3" "rd.udev.log_level=3"
"udev.log_priority=3"
]; ];
loader.timeout = 0; loader.timeout = 0;
}; };

View File

@@ -6,7 +6,7 @@
}: { }: {
imports = [ imports = [
../home/home_common.nix ../home/home_common.nix
../home/gnome.nix ../home/niri.nix
]; ];
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
@@ -14,11 +14,14 @@
home = { home = {
packages = with pkgs; [ packages = with pkgs; [
firefox firefox
lagrange
chromium #this might replace firefox
keepassxc keepassxc
thunderbird thunderbird
blender blender
vesktop vesktop
spotify spotify
alacritty
btop btop
zip zip
@@ -30,6 +33,8 @@
direnv direnv
texliveFull texliveFull
ispell ispell
calc
]; ];
}; };
@@ -42,7 +47,10 @@
emacs = { emacs = {
enable = true; enable = true;
package = pkgs.emacs-pgtk; package = pkgs.emacs-pgtk.override {
withTreeSitter = true;
withNativeCompilation = true;
};
extraPackages = epkgs: [ extraPackages = epkgs: [
epkgs.vterm epkgs.vterm
]; ];
@@ -60,11 +68,11 @@
emacs = { emacs = {
enable = true; enable = true;
defaultEditor = true; defaultEditor = true;
package = pkgs.emacs-pgtk;
}; };
}; };
stylix = { stylix = {
enable = true; enable = true;
autoEnable = true; autoEnable = true;
targets.gnome.enable = false;
}; };
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 MiB

After

Width:  |  Height:  |  Size: 2.1 MiB

View File

@@ -13,8 +13,8 @@
gc.automatic = true; gc.automatic = true;
settings = { settings = {
experimental-features = ["nix-command" "flakes"]; experimental-features = ["nix-command" "flakes"];
substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"]; #substituters = ["http://nix.dhilton.xyz/" "https://cache.nixos.org/"];
trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="]; #trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="];
}; };
}; };
@@ -30,7 +30,7 @@
users = { users = {
motd = "Welcome to the Server"; motd = "Welcome to the Server";
defaultUserShell = pkgs.nushell; defaultUserShell = pkgs.zsh;
users = { users = {
k = { k = {
isNormalUser = true; 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.enable = true;
hardware.bluetooth.powerOnBoot = true; hardware.bluetooth.powerOnBoot = true;

View File

@@ -5,5 +5,8 @@
... ...
}: { }: {
imports = [../home/home_common.nix]; 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;
};
} }

View File

@@ -3,11 +3,37 @@
lib, lib,
... ...
}: { }: {
networking.firewall = { networking = {
firewall = {
enable = true; enable = true;
allowedTCPPorts = [80 443 22]; allowedTCPPorts = [80 443 22 25565 26615 8080 53 19132];
allowedUDPPorts = []; 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 = { security.acme = {
acceptTerms = true; acceptTerms = true;
@@ -37,7 +63,7 @@
}; };
ollama = { ollama = {
enable = true; enable = false;
package = pkgs.ollama-intel; package = pkgs.ollama-intel;
}; };
@@ -70,8 +96,8 @@
}; };
home-assistant = { home-assistant = {
enable = true; enable = false;
extraComponents = ["wiz" "fail2ban" "ollama" "wyoming"]; extraComponents = ["wiz" "fail2ban" "ollama" "wyoming" "androidtv" "androidtv_remote"];
config = { config = {
default_config = {}; default_config = {};
"automation ui" = "!include automations.yaml"; "automation ui" = "!include automations.yaml";
@@ -85,12 +111,12 @@
wyoming = { wyoming = {
piper.servers."piperNix" = { piper.servers."piperNix" = {
enable = true; enable = false;
uri = "tcp://0.0.0.0:10200"; uri = "tcp://0.0.0.0:10200";
voice = "en-us-ryan-low"; voice = "en-us-ryan-low";
}; };
faster-whisper.servers."whisperNix" = { faster-whisper.servers."whisperNix" = {
enable = true; enable = false;
uri = "tcp://0.0.0.0:10300"; uri = "tcp://0.0.0.0:10300";
language = "en"; 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" = { "nix.dhilton.xyz" = {
locations."/".proxyPass = "http://127.0.0.1:5000"; locations."/".proxyPass = "http://127.0.0.1:5000";
}; };

View File

@@ -34,6 +34,9 @@
#!/bin/sh #!/bin/sh
export LD_LIBRARY_PATH="${prev.intel-compute-runtime.drivers}/lib" export LD_LIBRARY_PATH="${prev.intel-compute-runtime.drivers}/lib"
export OLLAMA_INTEL_GPU=1 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" "\$@" exec "$out/bin/ollama-base" "\$@"
EOF EOF
chmod +x "$out/bin/ollama-wrapped" chmod +x "$out/bin/ollama-wrapped"