tristan/nix
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request 'switch-to-unstable-os' (#3) from switch-to-unstable-os into main

Browse source 
Reviewed-on: #3
This commit is contained in:
Tristan D. 2024-03-08 18:27:02 +01:00
commit 684c82dd13
23 changed files with 650 additions and 229 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
ext/doom/config.el
View file

@ -24,10 +24,10 @@
(setq nerd-icons-font-names '("SymbolsNerdFontMono-Regular.ttf")) (setq nerd-icons-font-names '("SymbolsNerdFontMono-Regular.ttf"))
(setq doom-font (font-spec :family "Iosevka Nerd Font Mono" :size 14) (setq doom-font (font-spec :family "Iosevka Nerd Font Mono" :size 16)
doom-variable-pitch-font (font-spec :family "Iosevka Nerd Font Propo" :size 14) doom-variable-pitch-font (font-spec :family "Iosevka Nerd Font Propo" :size 16)
;; doom-symbol-font (font-spec :family "all-the-icons" :size 13) ;; doom-symbol-font (font-spec :family "all-the-icons" :size 13)
doom-big-font (font-spec :family "Iosevka Nerd Font Mono" :size 18 :weight 'demibold)) doom-big-font (font-spec :family "Iosevka Nerd Font Mono" :size 20 :weight 'demibold))
(defun add-back-emoji-fallback-font-families () (defun add-back-emoji-fallback-font-families ()
(when (fboundp 'set-fontset-font) (when (fboundp 'set-fontset-font)
@ -170,7 +170,6 @@
;; Shell stuff;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Shell stuff;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(setq shell-file-name (executable-find "bash")) (setq shell-file-name (executable-find "bash"))
(setq-default vterm-shell (executable-find "fish")) (setq-default vterm-shell (executable-find "fish"))
;; Background Transparency + Toggling ;; Background Transparency + Toggling
@ -303,6 +302,25 @@
("C-TAB" . 'copilot-accept-completion-by-word) ("C-TAB" . 'copilot-accept-completion-by-word)
("C-<tab>" . 'copilot-accept-completion-by-word))) ("C-<tab>" . 'copilot-accept-completion-by-word)))
;; gptel
;;(require 'gptel)
(use-package! gptel
:init
:config
(setq-default gptel-backend (gptel-make-openai "llama-cpp" ;Any name
:stream t
:protocol "http"
:host "100.64.0.3:8080"
:models '("test")
)
gptel-model "test")
(add-hook 'gptel-post-response-functions 'gptel-end-of-response)
(add-hook 'gptel-post-stream-hook 'gptel-auto-scroll))
;; ;; cape ;;;;; ;; ;; cape ;;;;;
;; (use-package! cape) ;; (use-package! cape)

4
ext/doom/init.el
View file

@ -45,7 +45,7 @@
ophints ; highlight the region an operation acts on ophints ; highlight the region an operation acts on
(popup +defaults) ; tame sudden yet inevitable temporary windows (popup +defaults) ; tame sudden yet inevitable temporary windows
;; tabs ; a tab bar for Emacs ;; tabs ; a tab bar for Emacs
treemacs ; a project drawer, like neotree but cooler (treemacs +lsp) ; a project drawer, like neotree but cooler
;;unicode ; extended unicode support for various languages ;;unicode ; extended unicode support for various languages
(vc-gutter (vc-gutter
+diff-hl +diff-hl
@ -139,7 +139,7 @@
;;elm ; care for a cup of TEA? ;;elm ; care for a cup of TEA?
emacs-lisp ; drown in parentheses emacs-lisp ; drown in parentheses
;;erlang ; an elegant language for a more civilized age ;;erlang ; an elegant language for a more civilized age
;;ess ; emacs speaks statistics (ess +lsp) ; emacs speaks statistics
;;factor ;;factor
;;faust ; dsp, but you get to keep your soul ;;faust ; dsp, but you get to keep your soul
;;fortran ; in FORTRAN, GOD is REAL (unless declared INTEGER) ;;fortran ; in FORTRAN, GOD is REAL (unless declared INTEGER)

2
ext/doom/packages.el
View file

@ -56,6 +56,8 @@
(package! copilot (package! copilot
:recipe (:host github :repo "zerolfx/copilot.el" :files ("*.el" "dist"))) :recipe (:host github :repo "zerolfx/copilot.el" :files ("*.el" "dist")))
;; gptel
(package! gptel :recipe (:host github :repo "akhil3417/gptel"))
;; Doom's packages are pinned to a specific commit and updated from release to ;; Doom's packages are pinned to a specific commit and updated from release to
;; release. The `unpin!' macro allows you to unpin single packages... ;; release. The `unpin!' macro allows you to unpin single packages...

616
flake.lock generated
View file

@ -1,20 +1,63 @@
{ {
"nodes": { "nodes": {
"attic": {
"inputs": {
"crane": [
"chaotic",
"crane"
],
"flake-compat": [
"chaotic",
"flake-compat"
],
"flake-utils": [
"chaotic",
"flake-utils"
],
"nixpkgs": [
"chaotic",
"nixpkgs"
],
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1707922053,
"narHash": "sha256-wSZjK+rOXn+UQiP1NbdNn5/UW6UcBxjvlqr2wh++MbM=",
"rev": "6eabc3f02fae3683bffab483e614bebfcd476b21",
"revCount": 193,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/zhaofengli/attic/0.1.193%2Brev-6eabc3f02fae3683bffab483e614bebfcd476b21/018da817-367d-75ac-bd41-470d92844bf2/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/zhaofengli/attic/0.1.%2A.tar.gz"
}
},
"chaotic": { "chaotic": {
"inputs": { "inputs": {
"attic": "attic",
"compare-to": "compare-to", "compare-to": "compare-to",
"conduit": "conduit",
"crane": "crane",
"fenix": "fenix",
"flake-compat": "flake-compat",
"flake-schemas": "flake-schemas", "flake-schemas": "flake-schemas",
"flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"jovian": "jovian",
"jujutsu": "jujutsu",
"niri": "niri",
"nix-filter": "nix-filter",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"systems": "systems", "systems": "systems",
"yafas": "yafas" "yafas": "yafas"
}, },
"locked": { "locked": {
"lastModified": 1706183550, "lastModified": 1709802317,
"narHash": "sha256-06BQrrPZDsnFL7WLUveDkKk1ZVxAnmc6mFNP4Vb84qY=", "narHash": "sha256-Xi/nghMW2ywH11M/7L9FgoYRXMpy42ODYvdkJ4lARVg=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "5c1df57391b39bf0880e7b3b9209e4f37e19fcde", "rev": "ecc8d401f3534069a9f0a5d113df9ca32b468a4a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -35,7 +78,72 @@
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/0.1.2.tar.gz" "url": "https://flakehub.com/f/chaotic-cx/nix-empty-flake/%3D0.1.2.tar.gz"
}
},
"conduit": {
"inputs": {
"attic": [
"chaotic",
"attic"
],
"crane": [
"chaotic",
"crane"
],
"fenix": [
"chaotic",
"fenix"
],
"flake-compat": [
"chaotic",
"flake-compat"
],
"flake-utils": [
"chaotic",
"flake-utils"
],
"nix-filter": [
"chaotic",
"nix-filter"
],
"nixpkgs": [
"chaotic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709522437,
"narHash": "sha256-mS0tYjN3B2cLfF+p8m/0YAMNOEQSx/HJT6BOy/XcOLw=",
"owner": "girlbossceo",
"repo": "conduwuit",
"rev": "b527ec46661a9a5efe22aa83eeb9fbbe37c41850",
"type": "gitlab"
},
"original": {
"owner": "girlbossceo",
"repo": "conduwuit",
"type": "gitlab"
}
},
"crane": {
"inputs": {
"nixpkgs": [
"chaotic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1706473297,
"narHash": "sha256-FbxuYIrHaXpsYCLtI1gCNJhd+qvERjPibXL3ctmVaCs=",
"rev": "fe812ef0dad5bb93a56c599d318be176d080281d",
"revCount": 493,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/ipetkov/crane/0.16.1/018d51be-1c17-765e-babc-c9e3bc8a5a14/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/ipetkov/crane/%2A.tar.gz"
} }
}, },
"disko": { "disko": {
@ -45,11 +153,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1706145859, "lastModified": 1709773529,
"narHash": "sha256-+iGHKwzKVW6aGAWfUmUSJW1KiE6WLYhKyTyWZMTw/cg=", "narHash": "sha256-CNz9ybeR88j8QQxy7YNFa8RlNq3pWnXLvocWIt2n5Mg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "5a2dc95464080764b9ca1b82b5d6d981157522be", "rev": "a2009bc2b4e1d3ff5360048292deb0d610aa064b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,7 +168,7 @@
}, },
"emacs-overlay": { "emacs-overlay": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs-unstable" "nixpkgs-unstable"
], ],
@ -69,12 +177,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1701334333, "lastModified": 1709802224,
"lastModified": 1706170797, "narHash": "sha256-8BQn24/XPLxcQ7j+pkcuWF8FUn+s8H7RexBul77VSbA=",
"narHash": "sha256-rsJ11xznoc2JSmM57bstxyas8xq8ZaEqNhQuQWyoQ/A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "913e44a13636fd111139ee683a6741ccb4c28672", "rev": "35b810dcbe9543e026f6a7095b955f7c9643b9b3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -92,11 +199,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1704757366, "lastModified": 1709593798,
"narHash": "sha256-0jgkqJkx9+C2WO4GXTizrAa9nVEWqhFru2Zjf5TNPvg=", "narHash": "sha256-vuYPYV5A98ge3iw/bCEN1s5rOTE96O4ult9Noydjv9k=",
"owner": "Mic92", "owner": "Mic92",
"repo": "envfs", "repo": "envfs",
"rev": "2c4a85dd313618199593cc266c63dc2e44e06322", "rev": "141f1146a826094568069e9b9027c7738b6babfe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -105,23 +212,43 @@
"type": "github" "type": "github"
} }
}, },
"fenix": {
"inputs": {
"nixpkgs": [
"chaotic",
"nixpkgs"
],
"rust-analyzer-src": "rust-analyzer-src"
},
"locked": {
"lastModified": 1709274179,
"narHash": "sha256-O6EC6QELBLHzhdzBOJj0chx8AOcd4nDRECIagfT5Nd0=",
"rev": "4be608f4f81d351aacca01b21ffd91028c23cc22",
"revCount": 1791,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/nix-community/fenix/0.1.1791%2Brev-4be608f4f81d351aacca01b21ffd91028c23cc22/018df913-b6d3-756c-b05c-358eca6e487d/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/nix-community/fenix/0.1.%2A.tar.gz"
}
},
"flake-compat": { "flake-compat": {
"flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github" "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": { "original": {
"owner": "edolstra", "type": "tarball",
"repo": "flake-compat", "url": "https://flakehub.com/f/edolstra/flake-compat/%2A.tar.gz"
"type": "github"
} }
}, },
"flake-compat_2": { "flake-compat_2": {
"flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
@ -139,11 +266,27 @@
"flake-compat_3": { "flake-compat_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1696426674,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -214,22 +357,60 @@
}, },
"flake-schemas": { "flake-schemas": {
"locked": { "locked": {
"lastModified": 1697467827, "lastModified": 1693491534,
"narHash": "sha256-j8SR19V1SRysyJwpOBF4TLuAvAjF5t+gMiboN4gYQDU=", "narHash": "sha256-ifw8Td8kD08J8DxFbYjeIx5naHcDLz7s2IFP3X42I/U=",
"rev": "764932025c817d4e500a8d2a4d8c565563923d29", "rev": "c702cbb663d6d70bbb716584a2ee3aeb35017279",
"revCount": 29, "revCount": 21,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.2/018b3da8-4cc3-7fbb-8ff7-1588413c53e2/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.1.1/018a4c59-80e1-708a-bb4d-854930c20f72/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/0.1.1.tar.gz" "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%3D0.1.1.tar.gz"
} }
}, },
"flake-utils": { "flake-utils": {
"inputs": {
"systems": [
"chaotic",
"systems"
]
},
"locked": {
"lastModified": 1709126324,
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
"revCount": 91,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/numtide/flake-utils/0.1.91%2Brev-d465f4819400de7c8d874d50b982301f28a84605/018defde-b702-7c49-9ad0-aa7e8781287b/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/numtide/flake-utils/0.1.%2A.tar.gz"
}
},
"flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": {
"lastModified": 1709126324,
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"inputs": {
"systems": "systems_3"
},
"locked": { "locked": {
"lastModified": 1705309234, "lastModified": 1705309234,
"narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
@ -244,25 +425,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": { "flake-utils_4": {
"inputs": {
"systems": "systems_3"
},
"locked": {
"lastModified": 1701680307,
"narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_4"
}, },
@ -280,13 +443,16 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_4": { "flake-utils_5": {
"inputs": {
"systems": "systems_5"
},
"locked": { "locked": {
"lastModified": 1667395993, "lastModified": 1705309234,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -304,11 +470,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1660459072, "lastModified": 1703887061,
"narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "gitignore.nix", "repo": "gitignore.nix",
"rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -353,7 +519,7 @@
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://flakehub.com/f/nix-community/home-manager/0.1.0.tar.gz" "url": "https://flakehub.com/f/nix-community/home-manager/0.1.%2A.tar.gz"
} }
}, },
"home-manager_2": { "home-manager_2": {
@ -363,25 +529,109 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1705659542, "lastModified": 1709764752,
"narHash": "sha256-WA3xVfAk1AYmFdwghT7mt/erYpsU6JPu9mdTEP/e9HQ=", "narHash": "sha256-+lM4J4JoJeiN8V+3WSWndPHj1pJ9Jc1UMikGbXLqCTk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "10cd9c53115061aa6a0a90aad0b0dde6a999cdb9", "rev": "cf111d1a849ddfc38e9155be029519b0e2329615",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
}, },
"jovian": {
"inputs": {
"nix-github-actions": "nix-github-actions",
"nixpkgs": [
"chaotic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709744297,
"narHash": "sha256-Q2LOs08hmFlzJdJMN4yNrWvZTegfpHEajLin0vcw7t0=",
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"rev": "f8e3302ee1e0ccaabc443f45dc415e117b54926f",
"type": "github"
},
"original": {
"owner": "Jovian-Experiments",
"repo": "Jovian-NixOS",
"type": "github"
}
},
"jujutsu": {
"inputs": {
"flake-utils": [
"chaotic",
"flake-utils"
],
"nixpkgs": [
"chaotic",
"nixpkgs"
],
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1709745623,
"narHash": "sha256-Al56OXS8GuqZUJny6yq1E1XAKEe+rowMOeqJKmnVfOc=",
"owner": "martinvonz",
"repo": "jj",
"rev": "1ee6b595a8a88dea3ead4ab55c224d9380b87375",
"type": "github"
},
"original": {
"owner": "martinvonz",
"repo": "jj",
"type": "github"
}
},
"niri": {
"inputs": {
"crane": [
"chaotic",
"crane"
],
"fenix": [
"chaotic",
"fenix"
],
"flake-utils": [
"chaotic",
"flake-utils"
],
"nix-filter": [
"chaotic",
"nix-filter"
],
"nixpkgs": [
"chaotic",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709744470,
"narHash": "sha256-ZM5dTj+c8HVnn+EBKuGy7aqPY3UOeRVl9R0iwSuRL6k=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "3ee2db71a456f5b009c1ba7c15c5376bb0a3bb0d",
"type": "github"
},
"original": {
"owner": "YaLTeR",
"repo": "niri",
"type": "github"
}
},
"nix-alien": { "nix-alien": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_3",
"nix-filter": "nix-filter", "nix-filter": "nix-filter_2",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixpkgs": [ "nixpkgs": [
"nix-alien", "nix-alien",
@ -390,11 +640,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1705306460, "lastModified": 1707986999,
"narHash": "sha256-tV42EZ0GAYDKUu8IUaeZgSsOBtp/1IO9jEkHpOj5K94=", "narHash": "sha256-uPCdmwnf2vcfKMxHvD8Hhs1o2yqfnK8Xz6oM7Urvspk=",
"owner": "thiagokokada", "owner": "thiagokokada",
"repo": "nix-alien", "repo": "nix-alien",
"rev": "f43ce845467ad2b90df34323dbed3de9f17471d7", "rev": "d6f007b3cab6cd16e50a0041c542a18793357737",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -405,11 +655,11 @@
}, },
"nix-filter": { "nix-filter": {
"locked": { "locked": {
"lastModified": 1701697642, "lastModified": 1705332318,
"narHash": "sha256-L217WytWZHSY8GW9Gx1A64OnNctbuDbfslaTEofXXRw=", "narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=",
"owner": "numtide", "owner": "numtide",
"repo": "nix-filter", "repo": "nix-filter",
"rev": "c843418ecfd0344ecb85844b082ff5675e02c443", "rev": "3449dc925982ad46246cfc36469baf66e1b64f17",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -418,16 +668,54 @@
"type": "github" "type": "github"
} }
}, },
"nix-filter_2": {
"locked": {
"lastModified": 1705332318,
"narHash": "sha256-kcw1yFeJe9N4PjQji9ZeX47jg0p9A0DuU4djKvg1a7I=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "3449dc925982ad46246cfc36469baf66e1b64f17",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nix-github-actions": {
"inputs": {
"nixpkgs": [
"chaotic",
"jovian",
"nixpkgs"
]
},
"locked": {
"lastModified": 1690328911,
"narHash": "sha256-fxtExYk+aGf2YbjeWQ8JY9/n9dwuEt+ma1eUFzF8Jeo=",
"owner": "zhaofengli",
"repo": "nix-github-actions",
"rev": "96df4a39c52f53cb7098b923224d8ce941b64747",
"type": "github"
},
"original": {
"owner": "zhaofengli",
"ref": "matrix-name",
"repo": "nix-github-actions",
"type": "github"
}
},
"nix-index-database": { "nix-index-database": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1705282324, "lastModified": 1707620986,
"narHash": "sha256-LnURMA7yCM5t7et9O2+2YfGQh0FKAfE5GyahNDDzJVM=", "narHash": "sha256-XE0tCSkSVBeJDWhjFwusNInwAhrnp+TloUNUpvnTiLw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "49aaeecf41ae0a0944e2c627cb515bcde428a1d1", "rev": "0cb4345704123492e6d1f1068629069413c80de0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -443,11 +731,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1705806513, "lastModified": 1709708644,
"narHash": "sha256-FcOmNjhHFfPz2udZbRpZ1sfyhVMr+C2O8kOxPj+HDDk=", "narHash": "sha256-XAFOkZ6yexsqeJrCXWoHxopq0i+7ZqbwATXomMnGmr4=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "f8e04fbcebcc24cebc91989981bd45f69b963ed7", "rev": "94a1e46434736a40f976a454f8bd3ea2144f349b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -458,8 +746,8 @@
}, },
"nix-ld-rs": { "nix-ld-rs": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_4",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
@ -478,18 +766,18 @@
}, },
"nix-wallpaper": { "nix-wallpaper": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_5",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1682599883, "lastModified": 1708554876,
"narHash": "sha256-3RLfNhq8decb2VOTJLboloPX1M7Rwy3iGZL4DV7aLd0=", "narHash": "sha256-gaL/q2OtucwPrh/nVm1kvtLSvGdcem0E87WZ+rozBYc=",
"owner": "lunik1", "owner": "lunik1",
"repo": "nix-wallpaper", "repo": "nix-wallpaper",
"rev": "e1dfc3e671f9af843721c32ed7c08ea9966426c6", "rev": "5058a76a9db42a7fdc05ce9cae0cc7c3c71acd22",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -516,34 +804,18 @@
"url": "https://git.vlt81.de/tristan/nixinate.git" "url": "https://git.vlt81.de/tristan/nixinate.git"
} }
}, },
"nixos-unstable": {
"locked": {
"lastModified": 1704722960,
"narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1705856552, "lastModified": 1709703039,
"narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
"rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
"revCount": 574351, "revCount": 592007,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.574351%2Brev-612f97239e2cc474c13c9dafa0df378058c5ad8d/018d3085-aff0-7a0b-ab80-1a9c414de8cd/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.592007%2Brev-9df3e30ce24fd28c7b3e2de0d986769db5d6225d/018e1732-2a3c-7a76-9ec9-7272cb294c13/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.0.tar.gz" "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1.%2A.tar.gz"
} }
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
@ -566,27 +838,43 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1673800717, "lastModified": 1702780907,
"narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", "narHash": "sha256-blbrBBXjjZt6OKTcYX1jpe9SRof2P9ZYWPzq22tzXAA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f", "rev": "1e2e384c5b7c50dbf8e9c441a9e58d85f408b01f",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-22.11", "ref": "nixos-23.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable_2": {
"locked": {
"lastModified": 1704874635,
"narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1704842529, "lastModified": 1709780214,
"narHash": "sha256-OTeQA+F8d/Evad33JMfuXC89VMetQbsU4qcaePchGr4=", "narHash": "sha256-p4iDKdveHMhfGAlpxmkCtfQO3WRzmlD11aIcThwPqhk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "eabe8d3eface69f5bb16c18f8662a702f50c20d5", "rev": "f945939fd679284d736112d3d5410eb867f3b31c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -598,11 +886,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1704722960, "lastModified": 1707268954,
"narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=", "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "317484b1ead87b9c1b8ac5261a8d2dd748a0492d", "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -646,16 +934,16 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1705774713, "lastModified": 1709703039,
"narHash": "sha256-j6ADaDH9XiumUzkTPlFyCBcoWYhO83lfgiSqEJF2zcs=", "narHash": "sha256-6hqgQ8OK6gsMu1VtcGKBxKQInRLHtzulDo9Z5jxHEFY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1b64fc1287991a9cce717a01c1973ef86cb1af0b", "rev": "9df3e30ce24fd28c7b3e2de0d986769db5d6225d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-23.11", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -700,11 +988,11 @@
"osx-kvm": "osx-kvm" "osx-kvm": "osx-kvm"
}, },
"locked": { "locked": {
"lastModified": 1704976837, "lastModified": 1709757255,
"narHash": "sha256-JRi/pI0MqysVh04yjylTwUn2nUUtYOlOSOqJcqFP1c8=", "narHash": "sha256-UGUwYIvV+vchrJQcByQPpvkev5c/uKvseDB1DhMqm0M=",
"owner": "matthewcroughan", "owner": "matthewcroughan",
"repo": "nixtheplanet", "repo": "nixtheplanet",
"rev": "c701c536210ed4afb0ae1da8e7a305f8366ae71d", "rev": "b384ebc166c896427cc9099f6afede61941b2458",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -715,11 +1003,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1706174248, "lastModified": 1709800027,
"narHash": "sha256-VNN7md+kJhBvl5bINEXybSG4jHavrQIlXdywpcaEEwc=", "narHash": "sha256-iyCUV3wbl+3kYpi5mJZQJRjFo/8YuuVR0UF3Ql5wLFw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "20f64c7125413fc19372f11b45db99363bea7c1f", "rev": "895e0855655804508fbeb90ed38bc82b6139c9bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -754,11 +1042,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1705946102, "lastModified": 1709634318,
"narHash": "sha256-0hy28d7qC7Hv6/KV7xefa03b2xFJIGHPYAPcsVwzTeM=", "narHash": "sha256-4jZRGyPYShyLocUnE0kqDoitqxqBCkuJ6w6/QX4bjYk=",
"owner": "pjones", "owner": "pjones",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "4d209a083aeefa7d4f8060de14896399bbc8f30b", "rev": "9bac5925cf7716979535eed9c88e307fa9744169",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -769,7 +1057,7 @@
}, },
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_4",
"flake-utils": [ "flake-utils": [
"nix-wallpaper", "nix-wallpaper",
"flake-utils" "flake-utils"
@ -779,14 +1067,14 @@
"nix-wallpaper", "nix-wallpaper",
"nixpkgs" "nixpkgs"
], ],
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1675337566, "lastModified": 1708018599,
"narHash": "sha256-jmLBTQcs1jFOn8h1Q5b5XwPfYgFOtcZ3+mU9KvfC6Js=", "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "5668d079583a5b594cb4e0cc0e6d84f1b93da7ae", "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -807,7 +1095,6 @@
"nix-ld-rs": "nix-ld-rs", "nix-ld-rs": "nix-ld-rs",
"nix-wallpaper": "nix-wallpaper", "nix-wallpaper": "nix-wallpaper",
"nixinate": "nixinate", "nixinate": "nixinate",
"nixos-unstable": "nixos-unstable",
"nixpkgs": "nixpkgs_5", "nixpkgs": "nixpkgs_5",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nixtheplanet": "nixtheplanet", "nixtheplanet": "nixtheplanet",
@ -815,6 +1102,50 @@
"plasma-manager": "plasma-manager" "plasma-manager": "plasma-manager"
} }
}, },
"rust-analyzer-src": {
"flake": false,
"locked": {
"lastModified": 1709219524,
"narHash": "sha256-8HHRXm4kYQLdUohNDUuCC3Rge7fXrtkjBUf0GERxrkM=",
"owner": "rust-lang",
"repo": "rust-analyzer",
"rev": "9efa23c4dacee88b93540632eb3d88c5dfebfe17",
"type": "github"
},
"original": {
"owner": "rust-lang",
"ref": "nightly",
"repo": "rust-analyzer",
"type": "github"
}
},
"rust-overlay": {
"inputs": {
"flake-utils": [
"chaotic",
"jujutsu",
"flake-utils"
],
"nixpkgs": [
"chaotic",
"jujutsu",
"nixpkgs"
]
},
"locked": {
"lastModified": 1707444620,
"narHash": "sha256-P8kRkiJLFttN+hbAOlm11wPxUrQZqKle+QtVCqFiGXY=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "78503e9199010a4df714f29a4f9c00eb2ccae071",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"systems": { "systems": {
"locked": { "locked": {
"lastModified": 1689347949, "lastModified": 1689347949,
@ -875,6 +1206,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -917,7 +1263,7 @@
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://flakehub.com/f/UbiqueLambda/yafas/0.1.0.tar.gz" "url": "https://flakehub.com/f/UbiqueLambda/yafas/0.1.%2A.tar.gz"
} }
} }
}, },

10
flake.nix
View file

@ -7,18 +7,15 @@
nixpkgs-unstable = { nixpkgs-unstable = {
url = "github:NixOS/nixpkgs/nixpkgs-unstable"; url = "github:NixOS/nixpkgs/nixpkgs-unstable";
}; };
nixos-unstable = {
url = "github:NixOS/nixpkgs/nixos-unstable";
};
nixpkgs = { nixpkgs = {
url = "github:NixOS/nixpkgs/nixos-23.11"; url = "github:NixOS/nixpkgs/nixos-unstable";
}; };
nixinate.url = "git+https://git.vlt81.de/tristan/nixinate.git"; nixinate.url = "git+https://git.vlt81.de/tristan/nixinate.git";
chaotic = { chaotic = {
url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.11"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
emacs-overlay = { emacs-overlay = {
@ -60,7 +57,6 @@
{ self { self
, nixpkgs , nixpkgs
, nixpkgs-unstable , nixpkgs-unstable
, nixos-unstable
, nixtheplanet , nixtheplanet
, nixinate , nixinate
, home-manager , home-manager
@ -75,12 +71,10 @@
} @ inputs: } @ inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
unstable-os = import nixos-unstable pkgs-args;
unstable-pkgs = import nixpkgs-unstable pkgs-args; unstable-pkgs = import nixpkgs-unstable pkgs-args;
my-overlay = final: prev: { my-overlay = final: prev: {
my = self.packages."${system}"; my = self.packages."${system}";
unstable-pkgs = unstable-pkgs.pkgs; unstable-pkgs = unstable-pkgs.pkgs;
unstable-os = unstable-os.pkgs;
}; };
overlays = [ overlays = [
my-overlay my-overlay

4
home-mods/audio/default.nix
View file

@ -7,10 +7,10 @@
services.easyeffects = { services.easyeffects = {
enable = true; enable = true;
# preset = "default"; # preset = "default";
package = pkgs.unstable-os.easyeffects; package = pkgs.easyeffects;
}; };
home.packages = with pkgs.unstable-os; [ home.packages = with pkgs; [
my.spotube my.spotube
spotify spotify
ncspot ncspot

57
home-mods/desktop/default.nix
View file

@ -13,7 +13,14 @@ in
{ {
programs.mpv = { programs.mpv = {
enable = true; enable = true;
package = pkgs.unstable-os.mpv; package = pkgs.mpv;
};
programs.thunderbird = {
enable = true;
package = pkgs.betterbird;
profiles."main" = {
isDefault = true;
};
}; };
home = { home = {
@ -21,31 +28,31 @@ in
packages = with pkgs; [ packages = with pkgs; [
bitwarden bitwarden
unstable-os.airshipper airshipper
unstable-os.ardour ardour
# blender # blender
unstable-os.brave brave
unstable-os.cavalier cavalier
unstable-os.freetube ffmpeg
unstable-os.filelight freetube
unstable-os.element-desktop filelight
unstable-os.inkscape element-desktop
unstable-os.jellyfin-media-player inkscape
# unstable-os.miraclecast jellyfin-mpv-shim
unstable-os.kate # miraclecast
unstable-os.kdenlive kate
unstable-os.krita kdenlive
unstable-os.libsForQt5.kdeconnect-kde krita
unstable-os.libsForQt5.plasma-vault kdePackages.kleopatra
unstable-os.libsForQt5.plasma-browser-integration kdePackages.plasma-vault
unstable-os.nextcloud-client kdePackages.plasma-browser-integration
unstable-os.onlyoffice-bin nextcloud-client
unstable-os.protonup-qt onlyoffice-bin
unstable-os.rustdesk protonup-qt
unstable-os.signal-desktop # rustdesk
unstable-os.tutanota-desktop signal-desktop
unstable-os.thunderbird tutanota-desktop
unstable-os.webcord-vencord webcord-vencord
]; ];
}; };
} }

6
home-mods/firefox/default.nix
View file

@ -5,7 +5,7 @@
}: { }: {
programs.firefox = { programs.firefox = {
enable = true; enable = true;
package = pkgs.unstable-os.firefox; package = pkgs.firefox;
profiles = { profiles = {
default = { default = {
@ -54,11 +54,13 @@
dearrow dearrow
deutsch-de-language-pack deutsch-de-language-pack
dictionary-german dictionary-german
flagfox
ipvfoo
leechblock-ng
localcdn localcdn
plasma-integration plasma-integration
privacy-badger privacy-badger
rust-search-extension rust-search-extension
leechblock-ng
sidebery sidebery
skip-redirect skip-redirect
sponsorblock sponsorblock

14
home-mods/shell/default.nix
View file

@ -8,7 +8,7 @@ let
doomemacsSrc = builtins.fetchGit { doomemacsSrc = builtins.fetchGit {
url = "https://github.com/doomemacs/doomemacs"; url = "https://github.com/doomemacs/doomemacs";
ref = "master"; ref = "master";
rev = "ff33ec8f7a89d168ca533612e2562883c89e029f"; rev = "bea81278fd2ecb65db6a63dbcd6db2f52921ee41";
}; };
neofetchThemesSrc = builtins.fetchGit { neofetchThemesSrc = builtins.fetchGit {
url = "https://github.com/Chick2D/neofetch-themes"; url = "https://github.com/Chick2D/neofetch-themes";
@ -187,11 +187,8 @@ in
}; };
packages = with pkgs.unstable-pkgs; [ packages = with pkgs.unstable-pkgs; [
btop
myEmacs myEmacs
imagemagick asciinema
rust-motd
zellij
any-nix-shell any-nix-shell
atool atool
aspell aspell
@ -200,6 +197,8 @@ in
aspellDicts.en-science aspellDicts.en-science
aspellDicts.de aspellDicts.de
binutils binutils
btop
calc
cmake cmake
curl curl
direnv direnv
@ -210,15 +209,18 @@ in
gnumake gnumake
gcc gcc
imagemagick imagemagick
imagemagick
libtool libtool
neofetch neofetch
nil nil
nixpkgs-fmt nixpkgs-fmt
nodejs_20 nodejs_20
tree
pandoc pandoc
python311Full python311Full
python311Packages.epc python311Packages.epc
python311Packages.orjson python311Packages.orjson
rust-motd
rcm rcm
(lib.mkIf config.services.gpg-agent.enable (lib.mkIf config.services.gpg-agent.enable
pinentry-emacs) pinentry-emacs)
@ -231,6 +233,8 @@ in
tree-sitter tree-sitter
wget wget
wl-clipboard wl-clipboard
zeal
zellij
zstd zstd
]; ];
}; };

12
os-mods/amdgpu/default.nix
View file

@ -18,14 +18,15 @@
services.xserver.videoDrivers = lib.mkDefault [ "modesetting" ]; services.xserver.videoDrivers = lib.mkDefault [ "modesetting" ];
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"L+ /opt/rocm/hip - - - - ${pkgs.unstable-os.rocmPackages.clr}" "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
]; ];
hardware.opengl = { hardware.opengl = {
driSupport = true; driSupport = true;
driSupport32Bit = true; driSupport32Bit = true;
extraPackages = with pkgs.unstable-os; [ extraPackages = with pkgs; [
amdvlk amdvlk
rocmPackages.rocm-runtime rocmPackages.rocm-runtime
rocmPackages.llvm.clang
rocm-opencl-icd rocm-opencl-icd
rocm-opencl-runtime rocm-opencl-runtime
vaapiVdpau vaapiVdpau
@ -35,7 +36,7 @@
gst_all_1.gstreamer gst_all_1.gstreamer
gst_all_1.gst-vaapi gst_all_1.gst-vaapi
]; ];
extraPackages32 = with pkgs.unstable-os; [ extraPackages32 = with pkgs; [
driversi686Linux.amdvlk driversi686Linux.amdvlk
driversi686Linux.vaapiVdpau driversi686Linux.vaapiVdpau
driversi686Linux.libvdpau-va-gl driversi686Linux.libvdpau-va-gl
@ -44,9 +45,12 @@
# Force radv # Force radv
environment.variables.AMD_VULKAN_ICD = "RADV"; environment.variables.AMD_VULKAN_ICD = "RADV";
environment.systemPackages = with pkgs.unstable-os; [ environment.systemPackages = with pkgs; [
vulkan-tools vulkan-tools
libva-utils libva-utils
glxinfo # TODO right place here or in desktop ?
clinfo
wayland-utils # TODO move somewhere better ?
# nixgl.nixGLIntel # nixgl.nixGLIntel
# nixgl.nixVulkanIntel # nixgl.nixVulkanIntel
]; ];

3
os-mods/common/default.nix
View file

@ -12,6 +12,7 @@
automatic = true; automatic = true;
dates = "weekly"; dates = "weekly";
options = "--delete-older-than 2w"; options = "--delete-older-than 2w";
randomizedDelaySec = "45min";
}; };
settings.auto-optimise-store = true; settings.auto-optimise-store = true;
package = pkgs.nixFlakes; package = pkgs.nixFlakes;
@ -162,7 +163,7 @@
gvfs.enable = true; gvfs.enable = true;
avahi.enable = true; avahi.enable = true;
avahi.nssmdns = true; avahi.nssmdns4 = true;
}; };
networking.firewall = { networking.firewall = {

19
os-mods/desktop/default.nix
View file

@ -4,6 +4,7 @@
, ... , ...
}: { }: {
programs.dconf.enable = true; programs.dconf.enable = true;
programs.partition-manager.enable = true;
fonts = { fonts = {
enableDefaultPackages = true; enableDefaultPackages = true;
@ -60,16 +61,28 @@
]; ];
}; };
programs.kdeconnect.enable = true;
security.pam.services = {
sddm.kwallet.enable = true;
kdewallet.kwallet.enable = true;
};
services = { services = {
xserver = { xserver = {
enable = true; enable = true;
xkb = {
layout = "us"; layout = "us";
xkbVariant = "alt-intl"; variant = "alt-intl";
};
desktopManager.plasma5.enable = true; # desktopManager.plasma5.enable = true;
# desktopManager.plasma5.useQtScaling = true;
desktopManager.plasma6.enable = true;
desktopManager.plasma6.enableQt5Integration = true;
displayManager = { displayManager = {
defaultSession = "plasmawayland"; # defaultSession = "plasmawayland";
sddm.enable = true; sddm.enable = true;

6
os-mods/desktop/gaming.nix
View file

@ -5,9 +5,9 @@
}: { }: {
programs.steam = { programs.steam = {
enable = true; enable = true;
package = pkgs.unstable-os.steam.override { package = pkgs.steam.override {
extraPkgs = pkgs: extraPkgs = pkgs:
with pkgs.unstable-os; [ with pkgs; [
xorg.libXcursor xorg.libXcursor
xorg.libXi xorg.libXi
xorg.libXinerama xorg.libXinerama
@ -30,7 +30,7 @@
proton-ge-custom proton-ge-custom
]; ];
environment.systemPackages = with pkgs.unstable-os; [ environment.systemPackages = with pkgs; [
gamescope gamescope
]; ];
} }

2
os-mods/network/default.nix
View file

@ -66,7 +66,7 @@
netclient = { netclient = {
enable = true; enable = true;
package = pkgs.unstable-os.netclient; package = pkgs.netclient;
}; };
tailscale = { tailscale = {

6
os-mods/ryzenapu/default.nix
View file

@ -8,7 +8,7 @@
# This automatically sets the ryzen apu TDP to 45 W on AC and 10W on battery # This automatically sets the ryzen apu TDP to 45 W on AC and 10W on battery
# addionally it enables and configures some general power management stuff like powertop # addionally it enables and configures some general power management stuff like powertop
environment.systemPackages = with pkgs.unstable-os; [ environment.systemPackages = with pkgs; [
ryzenadj ryzenadj
(writers.writeDashBin "set_tdp" '' (writers.writeDashBin "set_tdp" ''
set -efux set -efux
@ -26,7 +26,7 @@
unitConfig = { unitConfig = {
RefuseManualStart = true; RefuseManualStart = true;
}; };
path = with pkgs.unstable-os; [ path = with pkgs; [
coreutils coreutils
ryzenadj ryzenadj
]; ];
@ -41,7 +41,7 @@
description = "Change TDP to power saving TDP when on battery power"; description = "Change TDP to power saving TDP when on battery power";
wantedBy = [ "battery.target" ]; wantedBy = [ "battery.target" ];
unitConfig = { RefuseManualStart = true; }; unitConfig = { RefuseManualStart = true; };
path = with pkgs.unstable-os; [ path = with pkgs; [
coreutils coreutils
ryzenadj ryzenadj
]; ];

7
os-mods/virt/default.nix
View file

@ -3,17 +3,18 @@
, pkgs , pkgs
, ... , ...
}: { }: {
environment.systemPackages = with pkgs.unstable-os; [ environment.systemPackages = with pkgs; [
virtiofsd virtiofsd
virt-manager virt-manager
virt-viewer virt-viewer
virt-top virt-top
spice-gtk spice-gtk
gnome.gnome-boxes
]; ];
virtualisation.docker = { virtualisation.docker = {
enable = true; enable = true;
package = pkgs.unstable-os.docker; package = pkgs.docker;
storageDriver = lib.mkDefault "overlay2"; storageDriver = lib.mkDefault "overlay2";
liveRestore = false; liveRestore = false;
@ -22,7 +23,7 @@
virtualisation.libvirtd = { virtualisation.libvirtd = {
enable = true; enable = true;
package = pkgs.unstable-os.libvirt; package = pkgs.libvirt;
onShutdown = "suspend"; onShutdown = "suspend";
onBoot = "ignore"; onBoot = "ignore";

2
os-mods/xmr/default.nix
View file

@ -10,7 +10,7 @@
dataDir = "/media/SanDisk/monero"; # TODO make config option for this and set sensible default dataDir = "/media/SanDisk/monero"; # TODO make config option for this and set sensible default
limits.upload = 1024; limits.upload = 1024;
}; };
environment.systemPackages = with pkgs.unstable-os; [ environment.systemPackages = with pkgs; [
monero-gui monero-gui
monero-cli monero-cli
xmrig xmrig

15
systems/nixos-desk/disko.nix
View file

@ -1,3 +1,12 @@
let
cryptOpenArgs = [
"--allow-discards"
"--perf-same_cpu_crypt"
"--perf-submit_from_crypt_cpus"
"--perf-no_read_workqueue"
"--perf-no_write_workqueue"
];
in
{ {
disko.devices = { disko.devices = {
disk = { disk = {
@ -15,7 +24,7 @@
content = { content = {
type = "luks"; type = "luks";
name = "cryptboot_1"; name = "cryptboot_1";
extraOpenArgs = [ "--allow-discards" ]; extraOpenArgs = cryptOpenArgs;
passwordFile = "/tmp/secret.key"; passwordFile = "/tmp/secret.key";
additionalKeyFiles = [ ]; additionalKeyFiles = [ ];
# content is empty here as the btrfs partition will be created via extraArgs of the cryptroot_1 partition def # content is empty here as the btrfs partition will be created via extraArgs of the cryptroot_1 partition def
@ -26,7 +35,7 @@
content = { content = {
type = "luks"; type = "luks";
name = "cryptswap_1"; name = "cryptswap_1";
extraOpenArgs = [ "--allow-discards" ]; extraOpenArgs = cryptOpenArgs;
passwordFile = "/tmp/secret.key"; passwordFile = "/tmp/secret.key";
additionalKeyFiles = [ ]; additionalKeyFiles = [ ];
content = { content = {
@ -51,7 +60,7 @@
content = { content = {
type = "luks"; type = "luks";
name = "cryptboot_0"; name = "cryptboot_0";
extraOpenArgs = [ "--allow-discards" ]; extraOpenArgs = cryptOpenArgs;
passwordFile = "/tmp/secret.key"; passwordFile = "/tmp/secret.key";
additionalKeyFiles = [ ]; additionalKeyFiles = [ ];
content = { content = {

37
systems/nixos-he4/disko.nix
View file

@ -64,6 +64,15 @@
# /mnt # /mnt
# #
############################## ##############################
let
cryptOpenArgs = [
"--allow-discards"
"--perf-same_cpu_crypt"
"--perf-submit_from_crypt_cpus"
"--perf-no_read_workqueue"
"--perf-no_write_workqueue"
];
in
{ {
# The manual definitions are generated by nixos-generate-config # The manual definitions are generated by nixos-generate-config
# the commented out stuff are partitions created by disko # the commented out stuff are partitions created by disko
@ -103,7 +112,7 @@
content = { content = {
type = "luks"; type = "luks";
name = "crypted_ssd0"; name = "crypted_ssd0";
extraOpenArgs = [ "--allow-discards" ]; extraOpenArgs = cryptOpenArgs;
passwordFile = "/tmp/secret.key"; passwordFile = "/tmp/secret.key";
additionalKeyFiles = [ ]; additionalKeyFiles = [ ];
}; };
@ -113,7 +122,7 @@
content = { content = {
type = "luks"; type = "luks";
name = "crypted_swap0"; name = "crypted_swap0";
extraOpenArgs = [ "--allow-discards" ]; extraOpenArgs = cryptOpenArgs;
passwordFile = "/tmp/secret.key"; passwordFile = "/tmp/secret.key";
additionalKeyFiles = [ ]; additionalKeyFiles = [ ];
content = { content = {
@ -149,7 +158,7 @@
content = { content = {
type = "luks"; type = "luks";
name = "crypted_ssd1"; name = "crypted_ssd1";
extraOpenArgs = [ "--allow-discards" ]; extraOpenArgs = cryptOpenArgs;
passwordFile = "/tmp/secret.key"; passwordFile = "/tmp/secret.key";
additionalKeyFiles = [ ]; additionalKeyFiles = [ ];
}; };
@ -159,7 +168,7 @@
content = { content = {
type = "luks"; type = "luks";
name = "crypted_swap1"; name = "crypted_swap1";
extraOpenArgs = [ "--allow-discards " ]; extraOpenArgs = cryptOpenArgs;
passwordFile = "/tmp/secret.key "; passwordFile = "/tmp/secret.key ";
additionalKeyFiles = [ ]; additionalKeyFiles = [ ];
content = { content = {
@ -182,7 +191,7 @@
content = { content = {
type = "luks"; type = "luks";
name = "crypted_hdd0"; name = "crypted_hdd0";
extraOpenArgs = [ "--allow-discards" ]; extraOpenArgs = cryptOpenArgs;
passwordFile = "/tmp/secret.key"; passwordFile = "/tmp/secret.key";
additionalKeyFiles = [ ]; additionalKeyFiles = [ ];
}; };
@ -201,7 +210,7 @@
content = { content = {
type = "luks"; type = "luks";
name = "crypted_hdd1"; name = "crypted_hdd1";
extraOpenArgs = [ "--allow-discards" ]; extraOpenArgs = cryptOpenArgs;
passwordFile = "/tmp/secret.key"; passwordFile = "/tmp/secret.key";
additionalKeyFiles = [ ]; additionalKeyFiles = [ ];
}; };
@ -220,7 +229,7 @@
content = { content = {
type = "luks"; type = "luks";
name = "crypted_hdd2"; name = "crypted_hdd2";
extraOpenArgs = [ "--allow-discards" ]; extraOpenArgs = cryptOpenArgs;
passwordFile = "/tmp/secret.key"; passwordFile = "/tmp/secret.key";
additionalKeyFiles = [ ]; additionalKeyFiles = [ ];
}; };
@ -239,7 +248,7 @@
content = { content = {
type = "luks"; type = "luks";
name = "crypted_hdd3"; name = "crypted_hdd3";
extraOpenArgs = [ "--allow-discards" ]; extraOpenArgs = cryptOpenArgs;
passwordFile = "/tmp/secret.key"; passwordFile = "/tmp/secret.key";
additionalKeyFiles = [ ]; additionalKeyFiles = [ ];
}; };
@ -258,7 +267,7 @@
content = { content = {
type = "luks"; type = "luks";
name = "crypted_hdd4"; name = "crypted_hdd4";
extraOpenArgs = [ "--allow-discards" ]; extraOpenArgs = cryptOpenArgs;
passwordFile = "/tmp/secret.key"; passwordFile = "/tmp/secret.key";
additionalKeyFiles = [ ]; additionalKeyFiles = [ ];
}; };
@ -277,7 +286,7 @@
content = { content = {
type = "luks"; type = "luks";
name = "crypted_hdd5"; name = "crypted_hdd5";
extraOpenArgs = [ "--allow-discards" ]; extraOpenArgs = cryptOpenArgs;
passwordFile = "/tmp/secret.key"; passwordFile = "/tmp/secret.key";
additionalKeyFiles = [ ]; additionalKeyFiles = [ ];
}; };
@ -296,7 +305,7 @@
content = { content = {
type = "luks"; type = "luks";
name = "crypted_hdd6"; name = "crypted_hdd6";
extraOpenArgs = [ "--allow-discards" ]; extraOpenArgs = cryptOpenArgs;
passwordFile = "/tmp/secret.key"; passwordFile = "/tmp/secret.key";
additionalKeyFiles = [ ]; additionalKeyFiles = [ ];
}; };
@ -315,7 +324,7 @@
content = { content = {
type = "luks"; type = "luks";
name = "crypted_hdd7"; name = "crypted_hdd7";
extraOpenArgs = [ "--allow-discards" ]; extraOpenArgs = cryptOpenArgs;
passwordFile = "/tmp/secret.key"; passwordFile = "/tmp/secret.key";
additionalKeyFiles = [ ]; additionalKeyFiles = [ ];
}; };
@ -334,7 +343,7 @@
content = { content = {
type = "luks"; type = "luks";
name = "crypted_hdd8"; name = "crypted_hdd8";
extraOpenArgs = [ "--allow-discards" ]; extraOpenArgs = cryptOpenArgs;
passwordFile = "/tmp/secret.key"; passwordFile = "/tmp/secret.key";
additionalKeyFiles = [ ]; additionalKeyFiles = [ ];
}; };
@ -353,7 +362,7 @@
content = { content = {
type = "luks"; type = "luks";
name = "crypted_hdd9"; name = "crypted_hdd9";
extraOpenArgs = [ "--allow-discards" ]; extraOpenArgs = cryptOpenArgs;
passwordFile = "/tmp/secret.key"; passwordFile = "/tmp/secret.key";
additionalKeyFiles = [ ]; additionalKeyFiles = [ ];
}; };

2
systems/nixos-karl-kvm-guest/default.nix
View file

@ -96,7 +96,7 @@
# Virtualization # Virtualization
virtualisation.docker = { virtualisation.docker = {
enable = true; enable = true;
package = pkgs.unstable-os.docker; package = pkgs.docker;
# rootless = { # rootless = {
# enable = true; # enable = true;
# setSocketVariable = true; # setSocketVariable = true;

4
systems/nixos-pulse/default.nix
View file

@ -75,6 +75,7 @@
192.168.0.190 vpn.oekonzept.de 192.168.0.190 vpn.oekonzept.de
192.168.0.180 vewasmb.oekonzept.de 192.168.0.180 vewasmb.oekonzept.de
192.168.0.91 puppet.oekonzept.de 192.168.0.91 puppet.oekonzept.de
192.168.0.245 camt.oekonzept.net
192.168.0.245 cloud.oekonzept.net 192.168.0.245 cloud.oekonzept.net
192.168.0.245 office.oekonzept.net 192.168.0.245 office.oekonzept.net
192.168.0.245 llama.oekonzept.net 192.168.0.245 llama.oekonzept.net
@ -156,9 +157,10 @@
ACTION=="add", KERNEL=="enp5s0f4u1u1c2", TAG+="systemd", ENV{SYSTEMD_WANTS}="network-addresses-enp5s0f4u1u1c2.service" ACTION=="add", KERNEL=="enp5s0f4u1u1c2", TAG+="systemd", ENV{SYSTEMD_WANTS}="network-addresses-enp5s0f4u1u1c2.service"
ACTION=="remove", KERNEL=="enp5s0f4u1u1c2", RUN+="${pkgs.systemd}/bin/systemctl stop network-addresses-enp5s0f4u1u1c2.service" ACTION=="remove", KERNEL=="enp5s0f4u1u1c2", RUN+="${pkgs.systemd}/bin/systemctl stop network-addresses-enp5s0f4u1u1c2.service"
SUBSYSTEM=="pci", ATTR{power/control}="auto" SUBSYSTEM=="pci", ATTR{power/control}="auto"
ACTION=="add", SUBSYSTEM=="serio", DRIVERS=="atkbd", ATTR{power/wakeup}="disabled"
''; '';
environment.systemPackages = with pkgs.unstable-os; [ environment.systemPackages = with pkgs; [
android-tools android-tools
android-udev-rules android-udev-rules
]; ];

17
systems/nixos-pulse/disko.nix
View file

@ -1,3 +1,12 @@
let
cryptOpenArgs = [
"--allow-discards"
"--perf-same_cpu_crypt"
"--perf-submit_from_crypt_cpus"
"--perf-no_read_workqueue"
"--perf-no_write_workqueue"
];
in
{ {
disko.devices = { disko.devices = {
disk = { disk = {
@ -18,7 +27,7 @@
content = { content = {
type = "luks"; type = "luks";
name = "crypted_0"; name = "crypted_0";
extraOpenArgs = [ "--allow-discards" ]; extraOpenArgs = cryptOpenArgs;
passwordFile = "/tmp/secret.key"; passwordFile = "/tmp/secret.key";
additionalKeyFiles = [ ]; additionalKeyFiles = [ ];
# content is empty here as the btrfs partition will be created via extraArgs of the cryptroot_1 partition def # content is empty here as the btrfs partition will be created via extraArgs of the cryptroot_1 partition def
@ -30,7 +39,7 @@
content = { content = {
type = "luks"; type = "luks";
name = "crypted_swap_0"; name = "crypted_swap_0";
extraOpenArgs = [ "--allow-discards" ]; extraOpenArgs = cryptOpenArgs;
passwordFile = "/tmp/secret.key"; passwordFile = "/tmp/secret.key";
additionalKeyFiles = [ ]; additionalKeyFiles = [ ];
content = { content = {
@ -66,7 +75,7 @@
content = { content = {
type = "luks"; type = "luks";
name = "crypted_1"; name = "crypted_1";
extraOpenArgs = [ "--allow-discards" ]; extraOpenArgs = cryptOpenArgs;
passwordFile = "/tmp/secret.key"; passwordFile = "/tmp/secret.key";
additionalKeyFiles = [ ]; additionalKeyFiles = [ ];
content = { content = {
@ -123,7 +132,7 @@
content = { content = {
type = "luks"; type = "luks";
name = "crypted_swap_1"; name = "crypted_swap_1";
extraOpenArgs = [ "--allow-discards" ]; extraOpenArgs = cryptOpenArgs;
passwordFile = "/tmp/secret.key"; passwordFile = "/tmp/secret.key";
additionalKeyFiles = [ ]; additionalKeyFiles = [ ];
content = { content = {

6
users/default.nix
View file

@ -9,15 +9,15 @@
isNormalUser = true; isNormalUser = true;
description = "Testa Test"; description = "Testa Test";
extraGroups = [ "audio" "corectrl" "docker" "networkmanager" "i2c" "wheel" "libvirtd" "qemu-libvirtd" "input" ]; extraGroups = [ "audio" "corectrl" "docker" "networkmanager" "i2c" "wheel" "libvirtd" "qemu-libvirtd" "input" ];
shell = pkgs.unstable-os.fish; shell = pkgs.fish;
home = "/home/tester"; home = "/home/tester";
hashedPassword = "$6$YJT50/Za3FSFQuNT$0orD1URwoURoRKO9sIAsUiIHxOtEOjmPXn5Mp7vAmIYlgVmI629qS7YPUInmztEtEorRpkSMbV3.fCy9NQhKX."; hashedPassword = "$6$YJT50/Za3FSFQuNT$0orD1URwoURoRKO9sIAsUiIHxOtEOjmPXn5Mp7vAmIYlgVmI629qS7YPUInmztEtEorRpkSMbV3.fCy9NQhKX.";
}; };
users.users.tristand = { users.users.tristand = {
isNormalUser = true; isNormalUser = true;
description = "Tristan Druyen"; description = "Tristan Druyen";
extraGroups = [ "audio" "corectrl" "docker" "networkmanager" "i2c" "wheel" "libvirtd" "qemu-libvirtd" "input" ]; extraGroups = [ "audio" "corectrl" "dialout" "docker" "networkmanager" "i2c" "wheel" "libvirtd" "qemu-libvirtd" "input" ];
shell = pkgs.unstable-os.fish; shell = pkgs.fish;
home = "/home/tristand"; home = "/home/tristand";
hashedPassword = "$6$Wj.XY8JgH5EWuog4$HnbtPJXDEqKXFrzkPVEjih3PytcpBCrkfL7TAwkXd0IFced7kGMlZNliNsAqQ3XqfyUzAYiiKTIqoPVJEk.s.."; hashedPassword = "$6$Wj.XY8JgH5EWuog4$HnbtPJXDEqKXFrzkPVEjih3PytcpBCrkfL7TAwkXd0IFced7kGMlZNliNsAqQ3XqfyUzAYiiKTIqoPVJEk.s..";
}; };