erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:97ec77846ab92fa9fc2d0f2d00232787e81b463c
Branches Tags
erwin:main
...
compare: erwin:7674d40c26488229101268559abd3a1ef33ca2e4
Branches Tags
erwin:main

6 commits
97ec77846a ... 7674d40c26

Author SHA1 Message Date
Erwin Boskma
7674d40c26
Updated fonts, remove SuperSlicer 2024-12-02 23:43:16 +01:00
Erwin Boskma
516e989ff8
flake: Update ha-now-playing input 2024-12-02 14:52:29 +01:00
Erwin Boskma
1d3bdb9c1c
nix: use latest version 2024-12-02 14:50:29 +01:00
Erwin Boskma
b6c8a55e88
emacs: Fix auto-mode for org-mode, add jujutsu to vc root markers 2024-12-02 14:49:58 +01:00
Erwin Boskma
8cf8730082
flake.lock: Update 
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/341482e2f4d888e3f60cae1c12c3df896e7230d8?narHash=sha256-i%2BUw8VOHzQe9YdNwKRbzvaPWLE07tYVqUDzSFTXhRgk%3D' (2024-11-27)
  → 'github:nix-community/disko/2814a5224a47ca19e858e027f7e8bff74a8ea9f1?narHash=sha256-2uMaVAZn7fiyTUGhKgleuLYe5%2BEAAYB/diKxrM7g3as%3D' (2024-11-30)
• Updated input 'home-manager':
    'github:nix-community/home-manager/0941a2e14486ee30e2088afa1d2869f2486dd3b8?narHash=sha256-04V/vZK7Eca2EbEJNqKHUSa0RU5zXt15t03EdO0yEqs%3D' (2024-11-28)
  → 'github:nix-community/home-manager/d2e2bda6c050a61d51b8e395ad66b8fa48318e07?narHash=sha256-eZcDctzoDsdHAooCYc2uDwoAdt0weTYfNChtrAhJFN8%3D' (2024-12-02)
• Updated input 'microvm':
    'github:astro/microvm.nix/093ef734d3c37669860043a87dbf1c09fc6f5b38?narHash=sha256-6LmtOmeDpv9iHS8l0GNcppP11dKIJFMZLdFyxQ%2BqQBM%3D' (2024-11-26)
  → 'github:astro/microvm.nix/e8d5f12b834a59187c7ec147a8952a0567f97939?narHash=sha256-ratU5qCcRuOojgPWM90gda4qrxukNqbyFi%2Bkan2Ln04%3D' (2024-11-30)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/45348ad6fb8ac0e8415f6e5e96efe47dd7f39405?narHash=sha256-kF6rDeCshoCgmQz%2B7uiuPdREVFuzhIorGOoPXMalL2U%3D' (2024-11-24)
  → 'github:NixOS/nixos-hardware/fe01780d356d70fd119a19277bff71d3e78dad00?narHash=sha256-aQorWITXZu7b095UwnpUvcGt9dNJie/GO9r4hZfe2sU%3D' (2024-12-01)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/4633a7c72337ea8fd23a4f2ba3972865e3ec685d?narHash=sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0%3D' (2024-11-25)
  → 'github:nixos/nixpkgs/ac35b104800bff9028425fec3b6e8a41de2bbfff?narHash=sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE%2Bcrk%3D' (2024-12-01)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/fd0e3bf854b937632c92819d55d4ff8a130d5658?narHash=sha256-A2a4Cw66421Wojv1uqSGkD1XW960uJ7wHuwmvGCUJ8s%3D' (2024-11-28)
  → 'github:oxalica/rust-overlay/e66c0d43abf5bdefb664c3583ca8994983c332ae?narHash=sha256-aJmAIjZfWfPSWSExwrYBLRgXVvgF5LP1vaeUGOOIQ98%3D' (2024-12-02)
• Updated input 'sops':
    'github:Mic92/sops-nix/3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa?narHash=sha256-xtt95%2Bc7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk%3D' (2024-11-25)
  → 'github:Mic92/sops-nix/c6134b6fff6bda95a1ac872a2a9d5f32e3c37856?narHash=sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc%3D' (2024-12-02)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/84637a7ab04179bdc42aa8fd0af1909fba76ad0c?narHash=sha256-uI7TXEb231o8dkwB5AUCecx3AQtosRmL6hKgnckvjps%3D' (2024-11-26)
  → 'github:numtide/treefmt-nix/6209c381904cab55796c5d7350e89681d3b2a8ef?narHash=sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII%2BoAc%3D' (2024-11-29)
 2024-12-02 11:01:56 +01:00
Erwin Boskma
c6c22b53a3
flake.lock: Update 
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/2ed5e30fc7e34adf455db8b02b9151d3922a54ea?narHash=sha256-5EYzmoTpem2IB9JWzd41sL98pz3lyyCSTiCjv08i4Uk%3D' (2024-11-25)
  → 'github:nix-community/disko/341482e2f4d888e3f60cae1c12c3df896e7230d8?narHash=sha256-i%2BUw8VOHzQe9YdNwKRbzvaPWLE07tYVqUDzSFTXhRgk%3D' (2024-11-27)
• Updated input 'home-manager':
    'github:nix-community/home-manager/a9953635d7f34e7358d5189751110f87e3ac17da?narHash=sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A%3D' (2024-11-24)
  → 'github:nix-community/home-manager/0941a2e14486ee30e2088afa1d2869f2486dd3b8?narHash=sha256-04V/vZK7Eca2EbEJNqKHUSa0RU5zXt15t03EdO0yEqs%3D' (2024-11-28)
• Updated input 'microvm':
    'github:astro/microvm.nix/77f0b828505d569910502cd616718868d6a445e6?narHash=sha256-4ItNHtw9CVIJkWeTAu0xxlc0Qf9XBhUFQMfYZCow8yw%3D' (2024-11-25)
  → 'github:astro/microvm.nix/093ef734d3c37669860043a87dbf1c09fc6f5b38?narHash=sha256-6LmtOmeDpv9iHS8l0GNcppP11dKIJFMZLdFyxQ%2BqQBM%3D' (2024-11-26)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/23e89b7da85c3640bbc2173fe04f4bd114342367?narHash=sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w%3D' (2024-11-19)
  → 'github:nixos/nixpkgs/4633a7c72337ea8fd23a4f2ba3972865e3ec685d?narHash=sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0%3D' (2024-11-25)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72?narHash=sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E%3D' (2024-11-23)
  → 'github:oxalica/rust-overlay/fd0e3bf854b937632c92819d55d4ff8a130d5658?narHash=sha256-A2a4Cw66421Wojv1uqSGkD1XW960uJ7wHuwmvGCUJ8s%3D' (2024-11-28)
• Updated input 'sops':
    'github:Mic92/sops-nix/53c853fb1a7e4f25f68805ee25c83d5de18dc699?narHash=sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0%3D' (2024-11-21)
  → 'github:Mic92/sops-nix/3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa?narHash=sha256-xtt95%2Bc7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk%3D' (2024-11-25)
• Updated input 'treefmt-nix':
    'github:numtide/treefmt-nix/705df92694af7093dfbb27109ce16d828a79155f?narHash=sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw%3D' (2024-11-22)
  → 'github:numtide/treefmt-nix/84637a7ab04179bdc42aa8fd0af1909fba76ad0c?narHash=sha256-uI7TXEb231o8dkwB5AUCecx3AQtosRmL6hKgnckvjps%3D' (2024-11-26)
 2024-11-28 11:25:54 +01:00
6 changed files with 48 additions and 81 deletions
Show stats Expand all files Collapse all files

102
flake.lock
View file

@ -11,13 +11,13 @@
"locked": { "locked": {
"lastModified": 1731092955, "lastModified": 1731092955,
"narHash": "sha256-L1hLXf4IDZ0KoXbFiSNNZJ7IrReEr/J+CLt6Rl4Ea3M=", "narHash": "sha256-L1hLXf4IDZ0KoXbFiSNNZJ7IrReEr/J+CLt6Rl4Ea3M=",
"owner": "Kirottu", "owner": "anyrun-org",
"repo": "anyrun", "repo": "anyrun",
"rev": "d2017f224b2bfd7e33573c7070e7c3e2960c7dcc", "rev": "d2017f224b2bfd7e33573c7070e7c3e2960c7dcc",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Kirottu", "owner": "anyrun-org",
"repo": "anyrun", "repo": "anyrun",
"type": "github" "type": "github"
} }
@ -93,27 +93,12 @@
} }
}, },
"crane": { "crane": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-utils": [
"ha-now-playing",
"flake-utils"
],
"nixpkgs": [
"ha-now-playing",
"nixpkgs"
],
"rust-overlay": [
"ha-now-playing",
"rust-overlay"
]
},
"locked": { "locked": {
"lastModified": 1697165857, "lastModified": 1733016477,
"narHash": "sha256-Cho+TPHCIfx/sVo5scjNDP2XUCpUxcyKvoMlJ8w9dgQ=", "narHash": "sha256-Hh0khbqBeCtiNS0SJgqdWrQDem9WlPEc2KF5pAY+st0=",
"owner": "ipetkov", "owner": "ipetkov",
"repo": "crane", "repo": "crane",
"rev": "117ac48319c0dbcff5540781c7c5b18166e33f6a", "rev": "76d64e779e2fbaf172110038492343a8c4e29b55",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -150,11 +135,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732540163, "lastModified": 1732988076,
"narHash": "sha256-5EYzmoTpem2IB9JWzd41sL98pz3lyyCSTiCjv08i4Uk=", "narHash": "sha256-2uMaVAZn7fiyTUGhKgleuLYe5+EAAYB/diKxrM7g3as=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "2ed5e30fc7e34adf455db8b02b9151d3922a54ea", "rev": "2814a5224a47ca19e858e027f7e8bff74a8ea9f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -242,22 +227,6 @@
} }
}, },
"flake-compat_3": { "flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1696267196,
"narHash": "sha256-AAQ/2sD+0D18bb8hKuEEVpHUYD1GmO2Uh/taFamn6XQ=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "4f910c9827911b1ec2bf26b5a062cd09f8d89f85",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_4": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -380,14 +349,17 @@
], ],
"rust-overlay": [ "rust-overlay": [
"rust-overlay" "rust-overlay"
],
"treefmt-nix": [
"treefmt-nix"
] ]
}, },
"locked": { "locked": {
"lastModified": 1697294760, "lastModified": 1733140396,
"narHash": "sha256-kZdUwJihRNKM0TKM/l1dA4EySB4MZqaEXCqgoyJy+Vw=", "narHash": "sha256-wHCoHVxp38sEx0unA4c+CMsElMvrC7CrG/YC8sQUO2o=",
"ref": "main", "ref": "main",
"rev": "171c65e613914d00f52c326a3c375ee954daec45", "rev": "f861550625ba212d641e3ddf69625e6a1b3bb0ed",
"revCount": 103, "revCount": 105,
"type": "git", "type": "git",
"url": "https://git.datarift.nl/erwin/ha-now-playing.git" "url": "https://git.datarift.nl/erwin/ha-now-playing.git"
}, },
@ -404,11 +376,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732482255, "lastModified": 1733132298,
"narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", "narHash": "sha256-eZcDctzoDsdHAooCYc2uDwoAdt0weTYfNChtrAhJFN8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "a9953635d7f34e7358d5189751110f87e3ac17da", "rev": "d2e2bda6c050a61d51b8e395ad66b8fa48318e07",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -428,11 +400,11 @@
"spectrum": "spectrum" "spectrum": "spectrum"
}, },
"locked": { "locked": {
"lastModified": 1732541547, "lastModified": 1733003272,
"narHash": "sha256-4ItNHtw9CVIJkWeTAu0xxlc0Qf9XBhUFQMfYZCow8yw=", "narHash": "sha256-ratU5qCcRuOojgPWM90gda4qrxukNqbyFi+kan2Ln04=",
"owner": "astro", "owner": "astro",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "77f0b828505d569910502cd616718868d6a445e6", "rev": "e8d5f12b834a59187c7ec147a8952a0567f97939",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -525,11 +497,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1732483221, "lastModified": 1733066523,
"narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", "narHash": "sha256-aQorWITXZu7b095UwnpUvcGt9dNJie/GO9r4hZfe2sU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", "rev": "fe01780d356d70fd119a19277bff71d3e78dad00",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -540,11 +512,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1732014248, "lastModified": 1733015953,
"narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "narHash": "sha256-t4BBVpwG9B4hLgc6GUBuj3cjU7lP/PJfpTHuSqE+crk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "rev": "ac35b104800bff9028425fec3b6e8a41de2bbfff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -628,7 +600,7 @@
}, },
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_3",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
@ -682,11 +654,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732328983, "lastModified": 1733106880,
"narHash": "sha256-RHt12f/slrzDpSL7SSkydh8wUE4Nr4r23HlpWywed9E=", "narHash": "sha256-aJmAIjZfWfPSWSExwrYBLRgXVvgF5LP1vaeUGOOIQ98=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "ed8aa5b64f7d36d9338eb1d0a3bb60cf52069a72", "rev": "e66c0d43abf5bdefb664c3583ca8994983c332ae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -702,11 +674,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732186149, "lastModified": 1733128155,
"narHash": "sha256-N9JGWe/T8BC0Tss2Cv30plvZUYoiRmykP7ZdY2on2b0=", "narHash": "sha256-m6/qwJAJYcidGMEdLqjKzRIjapK4nUfMq7rDCTmZajc=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "53c853fb1a7e4f25f68805ee25c83d5de18dc699", "rev": "c6134b6fff6bda95a1ac872a2a9d5f32e3c37856",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -784,11 +756,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732292307, "lastModified": 1732894027,
"narHash": "sha256-5WSng844vXt8uytT5djmqBCkopyle6ciFgteuA9bJpw=", "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "705df92694af7093dfbb27109ce16d828a79155f", "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
flake.nix
View file

@ -82,7 +82,7 @@
}; };
anyrun = { anyrun = {
url = "github:Kirottu/anyrun"; url = "github:anyrun-org/anyrun";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -114,6 +114,7 @@
flake-utils.follows = "flake-utils"; flake-utils.follows = "flake-utils";
rust-overlay.follows = "rust-overlay"; rust-overlay.follows = "rust-overlay";
pre-commit-hooks.follows = "pre-commit-hooks"; pre-commit-hooks.follows = "pre-commit-hooks";
treefmt-nix.follows = "treefmt-nix";
}; };
}; };

3
home-manager/modules/emacs/config.org
View file

@ -831,6 +831,7 @@ Projectile works great to manage projects. It includes fuzzy search and supports
:diminish projectile-mode :diminish projectile-mode
:config :config
;; (setq projectile-completion-system 'ivy) ;; (setq projectile-completion-system 'ivy)
(add-to-list 'project-vc-extra-root-markers ".jj")
(projectile-mode) (projectile-mode)
:general :general
(:prefix "C-c" (:prefix "C-c"
@ -1766,7 +1767,7 @@ Configuration
#+name: org-config #+name: org-config
#+begin_src emacs-lisp :tangle no #+begin_src emacs-lisp :tangle no
(add-to-list 'auto-mode-alist '((rx ".org" eos) . org-mode)) (add-to-list 'auto-mode-alist '("\\.org\\'" . org-mode))
(dolist (face '((org-level-1 . 1.2) (dolist (face '((org-level-1 . 1.2)
(org-level-2 . 1.1) (org-level-2 . 1.1)
(org-level-3 . 1.05) (org-level-3 . 1.05)

14
modules/fonts/default.nix
View file

@ -27,15 +27,11 @@ in
packages = packages =
with pkgs; with pkgs;
[ [
(nerdfonts.override { nerd-fonts.iosevka
fonts = [ nerd-fonts.meslo-lg
"Iosevka" nerd-fonts.monaspace
"Meslo" nerd-fonts.noto
"Monaspace" nerd-fonts.recursive-mono
"Noto"
"Recursive"
];
})
corefonts corefonts
dejavu_fonts dejavu_fonts
google-fonts google-fonts

4
modules/nix-common/default.nix
View file

@ -38,8 +38,8 @@ in
# }; # };
nix = { nix = {
# package = pkgs.nixVersions.latest; package = pkgs.nixVersions.latest;
package = pkgs.nixVersions.nix_2_23; # package = pkgs.nixVersions.nix_2_23;
buildMachines = mkIf cfg.remote-builders [ buildMachines = mkIf cfg.remote-builders [
{ {

3
users/erwin/home.nix
View file

@ -272,13 +272,10 @@ in
steam steam
steamcmd steamcmd
steam-tui steam-tui
super-slicer-beta
units units
unzip unzip
vial vial
xdg-utils xdg-utils
# wineWowPackages.waylandFull
# winetricks
wl-clipboard wl-clipboard
wlvncc wlvncc
zeal zeal