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

Compare commits

base: erwin:2c9f3cc24dcf255e8c1383ac9cb8827897f8d903
Branches Tags
erwin:main
..
compare: erwin:04cb6a0c4cdc5ede6b9edb2cc636a4cc5c50f5d0
Branches Tags
erwin:main

5 commits
2c9f3cc24d ... 04cb6a0c4c

Author SHA1 Message Date
Erwin Boskma
04cb6a0c4c
flake.lock: Update
Some checks failed
/ check (push) Has been cancelled
Details 
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/1ae1f57dad13595600dd57b6a55fcbaef6673804' (2024-02-19)
  → 'github:nix-community/disko/23d308f0059955e3719efc81a34d1fc0369fbb74' (2024-02-22)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/39a63475945fea0d8b4e4aeb351f392c1c3beeab' (2024-02-21)
  → 'github:nix-community/emacs-overlay/841abef01afbd293aa80130bcbd811e4102d5770' (2024-02-23)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/e0da498ad77ac8909a980f07eff060862417ccf7' (2024-02-18)
  → 'github:NixOS/nixpkgs/3cb4ae6689d2aa3f363516234572613b31212b78' (2024-02-22)
• Updated input 'home-manager':
    'github:nix-community/home-manager/517601b37c6d495274454f63c5a483c8e3ca6be1' (2024-02-20)
  → 'github:nix-community/home-manager/0e0e9669547e45ea6cca2de4044c1a384fd0fe55' (2024-02-22)
• Updated input 'microvm':
    'github:astro/microvm.nix/c3f2eb54f96f56ec93fcccc7f14808f10a61e6ca' (2024-02-20)
  → 'github:astro/microvm.nix/5544916016482c91874b0b25fd069a6e041c2715' (2024-02-22)
• Updated input 'microvm/spectrum':
    'git+https://spectrum-os.org/git/spectrum?ref=refs/heads/main&rev=97e2f3429ee61dc37664b4d096b2fec48a57b691' (2023-12-22)
  → 'git+https://spectrum-os.org/git/spectrum?ref=refs/heads/main&rev=6d0e73864d28794cdbd26ab7b37259ab0e1e044c' (2024-02-19)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/106d3fec43bcea19cb2e061ca02531d54b542ce3' (2024-02-16)
  → 'github:NixOS/nixos-hardware/3f7d0bca003eac1a1a7f4659bbab9c8f8c2a0958' (2024-02-22)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/3d6647bf9d1f8e537b0d026c51ea25c0cdd92055' (2024-02-21)
  → 'github:oxalica/rust-overlay/67853eda5dfe64922b9deb0ebc246a846fe177c7' (2024-02-23)
 2024-02-23 11:36:47 +01:00
Erwin Boskma
6675c0a6c2
Add nheko Matrix client 2024-02-23 11:36:15 +01:00
Erwin Boskma
16f0b79fd0
emacs: Switch to nixfmt-rfc-style for formatting nix files 2024-02-23 11:35:56 +01:00
Erwin Boskma
10bf3510be
mimir: Add iwd 2024-02-23 11:33:18 +01:00
Erwin Boskma
441a7f8104
sway: Power on individual displays so order maybe is preserved 2024-02-23 11:32:03 +01:00
7 changed files with 60 additions and 40 deletions
Show stats Expand all files Collapse all files

50
flake.lock
View file

@ -124,11 +124,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708305517, "lastModified": 1708564520,
"narHash": "sha256-WYnEspeTTksC21obnnxWOGOAQbnBD0GES0S0XOLsJjs=", "narHash": "sha256-juduDTYBhGN6jNfQ5RMDpbQF+MkO0pj3k7XGDSTjAbs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "1ae1f57dad13595600dd57b6a55fcbaef6673804", "rev": "23d308f0059955e3719efc81a34d1fc0369fbb74",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -148,11 +148,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1708506424, "lastModified": 1708679224,
"narHash": "sha256-4fqy9oG7vmaCkRQPeQly7N4LwXAfOizm+EVqs7mHurk=", "narHash": "sha256-V66NAQSTakocPST2GYv4SKK+ALBg3sgCNq0jIOpNkpc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "39a63475945fea0d8b4e4aeb351f392c1c3beeab", "rev": "841abef01afbd293aa80130bcbd811e4102d5770",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -414,11 +414,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708451036, "lastModified": 1708591310,
"narHash": "sha256-tgZ38NummEdnXvxj4D0StHBzXgceAw8CptytHljH790=", "narHash": "sha256-8mQGVs8JccWTnORgoLOTh9zvf6Np+x2JzhIc+LDcJ9s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "517601b37c6d495274454f63c5a483c8e3ca6be1", "rev": "0e0e9669547e45ea6cca2de4044c1a384fd0fe55",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -438,11 +438,11 @@
"spectrum": "spectrum" "spectrum": "spectrum"
}, },
"locked": { "locked": {
"lastModified": 1708421045, "lastModified": 1708617817,
"narHash": "sha256-xoN9rB7Uyoj+fIjMvHN1l3dGyQff7hV4KIVCYDocn4U=", "narHash": "sha256-7zbgJ3Pzen8V3SS3yemo7hiua2gzP/gmIM8Of1t4c7M=",
"owner": "astro", "owner": "astro",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "c3f2eb54f96f56ec93fcccc7f14808f10a61e6ca", "rev": "5544916016482c91874b0b25fd069a6e041c2715",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -521,11 +521,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1708091350, "lastModified": 1708594753,
"narHash": "sha256-o28BJYi68qqvHipT7V2jkWxDiMS1LF9nxUsou+eFUPQ=", "narHash": "sha256-c/gH7iXS/IYH9NrFOT+aJqTq+iEBkvAkpWuUHGU3+f0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "106d3fec43bcea19cb2e061ca02531d54b542ce3", "rev": "3f7d0bca003eac1a1a7f4659bbab9c8f8c2a0958",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -586,11 +586,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1708294118, "lastModified": 1708566995,
"narHash": "sha256-evZzmLW7qoHXf76VCepvun1esZDxHfVRFUJtumD7L2M=", "narHash": "sha256-e/THimsoxxMAHSbwMKov5f5Yg+utTj6XVGEo24Lhx+0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e0da498ad77ac8909a980f07eff060862417ccf7", "rev": "3cb4ae6689d2aa3f363516234572613b31212b78",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -762,11 +762,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708481452, "lastModified": 1708654230,
"narHash": "sha256-s07K6pwJtnB7Z/3wbkf4iaYXj+H5CuDD94I8hohm3Ig=", "narHash": "sha256-f8B3nm0DIsWBmaLHvFvjJnqvFsEEoHxTjE9or5w4nIo=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "3d6647bf9d1f8e537b0d026c51ea25c0cdd92055", "rev": "67853eda5dfe64922b9deb0ebc246a846fe177c7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -799,11 +799,11 @@
"spectrum": { "spectrum": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1703273931, "lastModified": 1708358594,
"narHash": "sha256-CJ1Crdi5fXHkCiemovsp20/RC4vpDaZl1R6V273FecI=", "narHash": "sha256-e71YOotu2FYA67HoC/voJDTFsiPpZNRwmiQb4f94OxQ=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "97e2f3429ee61dc37664b4d096b2fec48a57b691", "rev": "6d0e73864d28794cdbd26ab7b37259ab0e1e044c",
"revCount": 597, "revCount": 614,
"type": "git", "type": "git",
"url": "https://spectrum-os.org/git/spectrum" "url": "https://spectrum-os.org/git/spectrum"
}, },

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

@ -1514,13 +1514,13 @@ Add [[https://github.com/NixOS/nix-mode][nix-mode]]
:hook (nix-mode . eglot-ensure)) :hook (nix-mode . eglot-ensure))
#+end_src #+end_src
Tell =nil= to use =nixpkgs-fmt= for formatting nix files. Tell =nil= to use =nixfmt= for formatting nix files.
#+begin_src emacs-lisp #+begin_src emacs-lisp
(with-eval-after-load 'eglot (with-eval-after-load 'eglot
(add-to-list 'eglot-server-programs (add-to-list 'eglot-server-programs
`(nix-mode . ("nil" :initializationOptions `(nix-mode . ("nil" :initializationOptions
(:formatting (:command ["nixpkgs-fmt"])))))) (:formatting (:command ["nixfmt"]))))))
#+end_src #+end_src
*** Common Lisp *** Common Lisp

2
home-manager/modules/emacs/default.nix
View file

@ -195,7 +195,7 @@ in
aspell aspell
lldb lldb
(nil.overrideAttrs (_: { doCheck = false; })) (nil.overrideAttrs (_: { doCheck = false; }))
nixpkgs-fmt nixfmt-rfc-style
python3 python3
] ]
++ (with aspellDicts; [ ++ (with aspellDicts; [

28
home-manager/modules/sway/default.nix
View file

@ -332,17 +332,23 @@ in
} }
]; ];
timeouts = [ timeouts =
{ let
timeout = 900; resumeMessages = builtins.concatStringsSep ", " (
command = swaylockcmd; builtins.map (name: "output ${name} power on") (builtins.attrNames cfg.output)
} );
{ in
timeout = 1200; [
command = "${pkgs.sway}/bin/swaymsg 'output * power off'"; {
resumeCommand = "${pkgs.sway}/bin/swaymsg 'output * power on'"; timeout = 900;
} command = swaylockcmd;
]; }
{
timeout = 1200;
command = "${pkgs.sway}/bin/swaymsg 'output * power off'";
resumeCommand = "${pkgs.sway}/bin/swaymsg '${resumeMessages}'";
}
];
}; };
}; };

14
machines/mimir/configuration.nix
View file

@ -206,6 +206,15 @@
internalInterfaces = [ "microvm" ]; internalInterfaces = [ "microvm" ];
externalInterface = "enp4s0"; externalInterface = "enp4s0";
}; };
wireless.iwd = {
enable = true;
settings = {
General = {
EnableNetworkConfiguration = true;
};
};
};
}; };
microvm.autostart = [ "miniflux" ]; microvm.autostart = [ "miniflux" ];
@ -406,7 +415,10 @@
}; };
environment = { environment = {
systemPackages = with pkgs; [ appimage-run ]; systemPackages = with pkgs; [
appimage-run
iwgtk
];
sessionVariables = { sessionVariables = {
WLR_NO_HARDWARE_CURSORS = "1"; WLR_NO_HARDWARE_CURSORS = "1";

1
users/erwin/home.nix
View file

@ -219,6 +219,7 @@ in
libreoffice-fresh libreoffice-fresh
minio-client minio-client
mpv mpv
nheko
nomachine-client nomachine-client
nordzy-cursor-theme nordzy-cursor-theme
(noson.overrideAttrs ( (noson.overrideAttrs (

1
users/erwin/work.nix
View file

@ -271,6 +271,7 @@ in
libreoffice-fresh libreoffice-fresh
minio-client minio-client
mpv mpv
nheko
nordzy-cursor-theme nordzy-cursor-theme
pamedia pamedia
pass pass