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

Compare commits

base: erwin:819936c86630b1965d3d1ec4ddb5f9b18703f89b
Branches Tags
erwin:main
...
compare: erwin:aa700320ec5bc92b64ca4355900cfe8654974d77
Branches Tags
erwin:main

4 commits
819936c866 ... aa700320ec

Author SHA1 Message Date
Erwin Boskma
aa700320ec
Packages are being moved out of the gnome scope 
For now, gnome-calculator and nautilus are relevant here.
gnome-keyring too, but that needs to be updated in home-manager.
 2024-07-05 13:32:36 +02:00
Erwin Boskma
6d82810fee
flake: pkgs.nodePackages.vscode-css-languageserver-bin was removed from nixpkgs 
Instead use pkgs.vscode-langservers-extracted
 2024-07-05 13:31:19 +02:00
Erwin Boskma
169881a34e
flake.lock: Update 
Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/44cd01cff6f778fed1fdef78e54972c81f0986f1?narHash=sha256-VJaTtUZArFFhDCTYIfrB9SF%2BtcnlrhELNJpKzpvYPqw%3D' (2024-07-04)
  → 'github:nix-community/emacs-overlay/e2e8c7303eafd8d3657e06c28be7b3b74c7024e6?narHash=sha256-L9MdoPyHWW31rFG172XjnXIIwvMB3nhjvWqQxacsCq0%3D' (2024-07-05)
• Updated input 'emacs-overlay/nixpkgs-stable':
    'github:NixOS/nixpkgs/28f8f3531ebdbea069995c20bd946a295699f275?narHash=sha256-sTya/Vhqtdi7Kxx/eVldJRGTPKcyGgFG3ZugOqcbmiE%3D' (2024-07-01)
  → 'github:NixOS/nixpkgs/7144d6241f02d171d25fba3edeaf15e0f2592105?narHash=sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL%2B%2BdvNjMp9I%3D' (2024-07-02)
• Updated input 'home-manager':
    'github:nix-community/home-manager/0a30138c694ab3b048ac300794c2eb599dc40266?narHash=sha256-lmE7B%2BQXw7lWdBu5GQlUABSpzPk3YBb9VbV%2BIYK5djk%3D' (2024-07-03)
  → 'github:nix-community/home-manager/bbe6e94737289c8cb92d4d8f9199fbfe4f11c0ba?narHash=sha256-K9JYdlPiyaXp33JRg7CT8rMwH56e4ncXSsXW/YKnNXc%3D' (2024-07-05)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/00d80d13810dbfea8ab4ed1009b09100cca86ba8?narHash=sha256-H3%2BEC5cYuq%2BgQW8y0lSrrDZfH71LB4DAf%2BTDFyvwCNA%3D' (2024-07-01)
  → 'github:nixos/nixpkgs/9f4128e00b0ae8ec65918efeba59db998750ead6?narHash=sha256-rwz8NJZV%2B387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ%3D' (2024-07-03)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/8deeed2dfa21837c7792b46b6a9b2e73f97b472b?narHash=sha256-h/O3PoV3KvQG4tC5UpANBZOsptAZCzEGiwyi%2B3oSpYc%3D' (2024-07-04)
  → 'github:oxalica/rust-overlay/5ad2d5884b9b16319c9c5ca4e80a5b8606b083ae?narHash=sha256-mNO3vfM43%2Bw4Bp%2BzMC8Dkf4ktLpYYRpk9tAOp4iumio%3D' (2024-07-05)
 2024-07-05 11:40:43 +02:00
Erwin Boskma
817221d6f7
emacs: Set catppuccin flavor before loading the theme 2024-07-05 11:39:45 +02:00
10 changed files with 27 additions and 29 deletions
Show stats Expand all files Collapse all files

30
flake.lock
View file

@ -221,11 +221,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1720058213, "lastModified": 1720170582,
"narHash": "sha256-VJaTtUZArFFhDCTYIfrB9SF+tcnlrhELNJpKzpvYPqw=", "narHash": "sha256-L9MdoPyHWW31rFG172XjnXIIwvMB3nhjvWqQxacsCq0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "44cd01cff6f778fed1fdef78e54972c81f0986f1", "rev": "e2e8c7303eafd8d3657e06c28be7b3b74c7024e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -587,11 +587,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720045378, "lastModified": 1720167120,
"narHash": "sha256-lmE7B+QXw7lWdBu5GQlUABSpzPk3YBb9VbV+IYK5djk=", "narHash": "sha256-K9JYdlPiyaXp33JRg7CT8rMwH56e4ncXSsXW/YKnNXc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "0a30138c694ab3b048ac300794c2eb599dc40266", "rev": "bbe6e94737289c8cb92d4d8f9199fbfe4f11c0ba",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -753,11 +753,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1719837636, "lastModified": 1719957072,
"narHash": "sha256-sTya/Vhqtdi7Kxx/eVldJRGTPKcyGgFG3ZugOqcbmiE=", "narHash": "sha256-gvFhEf5nszouwLAkT9nWsDzocUTqLWHuL++dvNjMp9I=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "28f8f3531ebdbea069995c20bd946a295699f275", "rev": "7144d6241f02d171d25fba3edeaf15e0f2592105",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -801,11 +801,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1719848872, "lastModified": 1720031269,
"narHash": "sha256-H3+EC5cYuq+gQW8y0lSrrDZfH71LB4DAf+TDFyvwCNA=", "narHash": "sha256-rwz8NJZV+387rnWpTYcXaRNvzUSnnF9aHONoJIYmiUQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "00d80d13810dbfea8ab4ed1009b09100cca86ba8", "rev": "9f4128e00b0ae8ec65918efeba59db998750ead6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -943,11 +943,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1720059535, "lastModified": 1720145907,
"narHash": "sha256-h/O3PoV3KvQG4tC5UpANBZOsptAZCzEGiwyi+3oSpYc=", "narHash": "sha256-mNO3vfM43+w4Bp+zMC8Dkf4ktLpYYRpk9tAOp4iumio=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "8deeed2dfa21837c7792b46b6a9b2e73f97b472b", "rev": "5ad2d5884b9b16319c9c5ca4e80a5b8606b083ae",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -312,13 +312,13 @@
nodejs nodejs
nodePackages.typescript-language-server nodePackages.typescript-language-server
nodePackages.yaml-language-server nodePackages.yaml-language-server
nodePackages.vscode-css-languageserver-bin
nodePackages.prettier nodePackages.prettier
openssl openssl
pciutils pciutils
pkgs.sops pkgs.sops
ssh-to-age ssh-to-age
taplo taplo
vscode-langservers-extracted
yj yj
inputs'.disko.packages.disko inputs'.disko.packages.disko

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

@ -376,12 +376,10 @@ I like the [[https://draculatheme.com][dracula theme]]
So is [[https://github.com/catppuccin/emacs][Catppuccin]] So is [[https://github.com/catppuccin/emacs][Catppuccin]]
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package catppuccin-theme (use-package catppuccin-theme
:init :init
(load-theme 'catppuccin :no-confirm) (setq catppuccin-flavor 'latte)
:config (load-theme 'catppuccin :no-confirm))
(setq catppuccin-flavor 'latte)
(catppuccin-reload))
#+end_src #+end_src
Set fonts. Set fonts.

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

@ -113,7 +113,7 @@ in
# bind = ,XF86AudioRaiseVolume,exec,${pkgs.pamedia}/bin/pamedia up # bind = ,XF86AudioRaiseVolume,exec,${pkgs.pamedia}/bin/pamedia up
# bind = ,XF86AudioLowerVolume,exec,${pkgs.pamedia}/bin/pamedia down # bind = ,XF86AudioLowerVolume,exec,${pkgs.pamedia}/bin/pamedia down
# bind = ,XF86AudioMute,exec,${pkgs.pamedia}/bin/pamedia mute # bind = ,XF86AudioMute,exec,${pkgs.pamedia}/bin/pamedia mute
# bind = ,XF86Calculator,exec,${pkgs.gnome.gnome-calculator}/bin/gnome-calculator # bind = ,XF86Calculator,exec,${pkgs.gnome-calculator}/bin/gnome-calculator
# bind = $mod,D,exec,${pkgs.swaynotificationcenter}/bin/swaync-client -t -sw # bind = $mod,D,exec,${pkgs.swaynotificationcenter}/bin/swaync-client -t -sw

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

@ -196,7 +196,7 @@ in
"XF86AudioRaiseVolume" = "exec --no-startup-id ${pkgs.pamedia}/bin/pamedia up"; "XF86AudioRaiseVolume" = "exec --no-startup-id ${pkgs.pamedia}/bin/pamedia up";
"XF86AudioLowerVolume" = "exec --no-startup-id ${pkgs.pamedia}/bin/pamedia down"; "XF86AudioLowerVolume" = "exec --no-startup-id ${pkgs.pamedia}/bin/pamedia down";
"XF86AudioMute" = "exec --no-startup-id ${pkgs.pamedia}/bin/pamedia mute"; "XF86AudioMute" = "exec --no-startup-id ${pkgs.pamedia}/bin/pamedia mute";
"XF86Calculator" = "exec ${pkgs.gnome.gnome-calculator}/bin/gnome-calculator"; "XF86Calculator" = "exec ${pkgs.gnome-calculator}/bin/gnome-calculator";
}; };
modes = { modes = {

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

@ -134,7 +134,7 @@ in
"None XF86AudioRaiseVolume" = "spawn '${pkgs.pamedia}/bin/pamedia up'"; "None XF86AudioRaiseVolume" = "spawn '${pkgs.pamedia}/bin/pamedia up'";
"None XF86AudioLowerVolume" = "spawn '${pkgs.pamedia}/bin/pamedia down'"; "None XF86AudioLowerVolume" = "spawn '${pkgs.pamedia}/bin/pamedia down'";
"None XF86AudioMute" = "spawn '${pkgs.pamedia}/bin/pamedia mute'"; "None XF86AudioMute" = "spawn '${pkgs.pamedia}/bin/pamedia mute'";
"None XF86Calculator" = "spawn ${pkgs.gnome.gnome-calculator}/bin/gnome-calculator"; "None XF86Calculator" = "spawn ${pkgs.gnome-calculator}/bin/gnome-calculator";
"${mod} c" = mkIf config.eboskma.programs.emacs.enable "spawn '${config.eboskma.programs.emacs.package}/bin/emacsclient -c'"; "${mod} c" = mkIf config.eboskma.programs.emacs.enable "spawn '${config.eboskma.programs.emacs.package}/bin/emacsclient -c'";

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

@ -256,7 +256,7 @@ in
"XF86AudioRaiseVolume" = "exec ${pkgs.pamedia}/bin/pamedia up"; "XF86AudioRaiseVolume" = "exec ${pkgs.pamedia}/bin/pamedia up";
"XF86AudioLowerVolume" = "exec ${pkgs.pamedia}/bin/pamedia down"; "XF86AudioLowerVolume" = "exec ${pkgs.pamedia}/bin/pamedia down";
"XF86AudioMute" = "exec ${pkgs.pamedia}/bin/pamedia mute"; "XF86AudioMute" = "exec ${pkgs.pamedia}/bin/pamedia mute";
"XF86Calculator" = "exec ${pkgs.gnome.gnome-calculator}/bin/gnome-calculator"; "XF86Calculator" = "exec ${pkgs.gnome-calculator}/bin/gnome-calculator";
"${mod}+d" = "exec ${pkgs.swaynotificationcenter}/bin/swaync-client --toggle-panel --skip-wait"; "${mod}+d" = "exec ${pkgs.swaynotificationcenter}/bin/swaync-client --toggle-panel --skip-wait";
"${mod}+Shift+d" = "exec ${pkgs.swaynotificationcenter}/bin/swaync-client --toggle-dnd --skip-wait"; "${mod}+Shift+d" = "exec ${pkgs.swaynotificationcenter}/bin/swaync-client --toggle-dnd --skip-wait";

2
machines/thor/home.nix
View file

@ -58,12 +58,12 @@ in
bottom bottom
falkon falkon
fd fd
gnome.nautilus
imagemagick imagemagick
imv imv
iotop iotop
libnotify libnotify
mpv mpv
nautilus
nordzy-cursor-theme nordzy-cursor-theme
quintom-cursor-theme quintom-cursor-theme
procs procs

2
users/erwin/home.nix
View file

@ -202,7 +202,6 @@ in
fd fd
ffmpeg_5-full ffmpeg_5-full
freecad freecad
gnome.nautilus
helvum helvum
imagemagick imagemagick
(imv.override { (imv.override {
@ -223,6 +222,7 @@ in
libreoffice-fresh libreoffice-fresh
minio-client minio-client
mpv mpv
nautilus
nheko nheko
(noson.overrideAttrs (_: { (noson.overrideAttrs (_: {
qtWrapperArgs = "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.libpulseaudio ]}"; qtWrapperArgs = "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ pkgs.libpulseaudio ]}";

2
users/erwin/work.nix
View file

@ -248,7 +248,6 @@ in
easyeffects easyeffects
fd fd
ffmpeg_5-full ffmpeg_5-full
gnome.nautilus
icemon icemon
imagemagick imagemagick
(imv.override { (imv.override {
@ -267,6 +266,7 @@ in
libreoffice-fresh libreoffice-fresh
minio-client minio-client
mpv mpv
nautilus
nheko nheko
pamedia pamedia
pass pass