Compare commits

...

48 Commits

Author SHA1 Message Date
d74f3880ca
[shared] Helix config
Support for more languages in Helix. C-f to format. Autosave. Added some lsp packages
2025-04-19 19:37:12 +02:00
f1bf7b4ded
[shared] Gitmoji-cli
Added gitmoji-cli to home-manager
2025-04-19 18:07:55 +02:00
985a71d901
[shared] Replace Neovim with Helix
Moved Helix editor to shared.
Removed Nixvim flake and it's config
2025-04-19 17:54:56 +02:00
7e5bc137e5
[shared] Added eza, ls replacement 2025-04-19 17:05:35 +02:00
923b0c8980
[shared] Zoxide cd alias. Replaced Papers with sioyek 2025-04-19 16:27:53 +02:00
e97dd6f5ce
[shared] Updated Zed config, changed user config to just username 2025-04-18 19:49:14 +02:00
31c25681c5
[thinkpad] Fingerprint for sudo and login. Upgraded hyprlock to unstable 2025-04-18 17:54:17 +02:00
9e96de997d
[pi4] Added Sops with new hash. Added boot recipe to justfile 2025-04-18 13:59:06 +00:00
b521aebef6
🐛 [pi4] Fix wrong paths. Added Zoxide 2025-04-17 12:49:59 +00:00
feb1d07500
[pi4] Public age key for pi4, generate ssh key in justfile 2025-04-17 10:25:14 +00:00
4f126bab90
📝 [shared] Add justfile comments 2025-04-17 12:06:57 +02:00
4b3ad49384
🐛 [desktop] Fix wallpaper not overriding default setting 2025-04-17 12:06:13 +02:00
01e5fb42d3
[shared] Sops nix for user passwords 2025-04-17 00:31:19 +02:00
8244fe8927
[pi4] Added gnome-keyring for keys 2025-04-16 21:17:50 +00:00
244a029d70
[pi4] Nftables firewall config, moved security.nix to security dir 2025-04-16 21:17:50 +00:00
36ba00efc3
[shared] Toggle hidden files using ctrl+h in Yazi 2025-04-16 15:45:57 +02:00
f1d2672194
[shared] Moved cmdline tools to /shell in home-manager config. Added Yazi catppuccin theme instead of manual 2025-04-16 15:10:40 +02:00
b9e009b0cb
[shell] Added shell for formatting entire repo 2025-04-16 14:16:00 +02:00
8f1782eccd
🐛 [thinkpad] Fix hypr overrides not overriding 2025-04-16 13:50:22 +02:00
ed6a435d79
[pi4] Replaced Nvim with Helix editor 2025-04-16 09:26:50 +00:00
7ed64943a6
🐛 [shared] Moved nixfmt to formatters.nix 2025-04-16 10:39:49 +02:00
3c5484f1a1
[shared] Formatters in their own file 2025-04-16 00:08:42 +02:00
e515408ef2
🐛 [pi4] Fix wrong paths, added missing prettier formatter 2025-04-15 22:03:50 +00:00
5a23b66666
[pi4] Tailscale, just, nh, experimentals, fish in module 2025-04-15 23:44:15 +02:00
22ab5aa5cf
[pi4] Split module config 2025-04-15 23:39:10 +02:00
4ed23cdf5f
Pi4 home-manager config 2025-04-15 23:22:49 +02:00
a47b9bb118
Moved gpg config, added programs.gpg 2025-04-15 23:15:40 +02:00
4df44fa4de
🐛 Fix build errors on pi4, added configs to push 2025-04-15 21:14:17 +00:00
3df0986257
:Moved zen styling to hosts: 2025-04-15 18:26:14 +02:00
57d4f949aa
🐛 Fix build errors. Moved zen styling to hosts and app to shared. Start tailscale in justfile 2025-04-15 18:22:06 +02:00
4a884f5e6e
Monitor specific configs in hosts 2025-04-15 17:48:57 +02:00
980334b44b
Prefer rebase when pulling from git 2025-04-15 13:01:23 +02:00
0474fd9802
Moved yubikey config to security dir and rename 2025-04-15 13:01:23 +02:00
16c4a8f46b
Split up config files to multiple and added imports. Fixed default values for systemConfigs 2025-04-15 12:48:27 +02:00
9611b8bb8d
Moved modeules into shared 2025-04-14 23:30:50 +02:00
3b6a3e5a66
🐛 Moved fmt to before git add, formatted file 2025-04-13 13:22:57 +02:00
a7836ff585
🐛 Fix config errors 2025-04-13 11:57:32 +02:00
f0ce1f4169
♻️ Moved git key to desktop config, step variable in hyprpanel audio 2025-04-13 11:40:05 +02:00
a0537f5634
Moved common home-manager config to shared/home-manager 2025-04-12 23:29:10 +02:00
0649473709
Added pi4 to systems, moved getSecret function to lib 2025-04-12 20:25:10 +02:00
6ca92c8537
Added Thinkpad and pi4 configs 2025-04-12 19:45:01 +02:00
00cf2c38f9
Pass hostName in args, fix Hyprpanel theming, removed unused flake and overlay 2025-04-12 18:51:28 +02:00
e3a1dd36d7
Moved modules and hm dir to hosts dir. Moved some code to shared and extended lib with custom functions 2025-04-12 17:05:38 +02:00
df5bea9cc0
Added pdf-arranger 2025-04-12 11:19:08 +02:00
b5c273e072
Just recipe to update single flake, moved some home configs 2025-04-06 12:55:05 +02:00
11e8f2f8c6
Grayjay, Imv, updated dependencies
- Added Grayjay flake

- Added imv

- Set imv as default image viewer

- Changed catppuccin homeManagerModules to homeModules

- Media dir in home dir for media config

- pkg-config for rust development

- Removed Loupe image viewer

- Moved mpv to media dir
2025-04-02 20:09:55 +02:00
542a627e23
♻️ Moved wallpapers, added wallpapers and secrets to theme and common files 2025-03-09 12:29:09 +01:00
1ff146e3c0
♻️ Replace imports with function argument, hyprpanel does not follow nixpkgs, git push alias 2025-03-09 11:25:26 +01:00
160 changed files with 1936 additions and 7340 deletions

2
.gitattributes vendored
View File

@ -1 +1 @@
home-manager/secrets/* filter=git-crypt diff=git-crypt
shared/secrets/weather-api-key filter=git-crypt diff=git-crypt

View File

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 1.1 MiB

9
.sops.yaml Normal file
View File

@ -0,0 +1,9 @@
keys:
- &desktop age1fxr5s6d6ar0xy5pr63kpq93tk7jha5k96jcxnyquj6s2mw8mmcpss8w29w
- &pi4 age1xlnprpvshv93eerthxzg6cahklsfc4efh8dd6u8dte9u6cl0u5qsz48qlt
creation_rules:
- path_regex: shared/secrets/secrets.yaml$
key_groups:
- age:
- *desktop
- *pi4

View File

@ -1,8 +1,8 @@
# NixOS Configurations
My NixOS configurations with dotfiles for my desktop
My NixOS configurations with dotfiles for my systems.
![Screenshot of desktop](./assets/desktop.png)
![Screenshot of desktop](./.gitea/assets/desktop.png)
## Uses
@ -57,5 +57,11 @@ Update and switch
- Will update the flakes and nix-channel, then switch if there are no errors
```Shell
just update
just update-all
```
To update a single flake and rebuild
```Shell
just update zen-browser
```

View File

@ -1,69 +0,0 @@
{
pkgs,
outputs,
...
}:
let
common = import ./common.nix;
in
{
imports = [ ./modules ];
nixpkgs.overlays = [ outputs.overlays.unstable-packages ];
# Bootloader.
boot.loader = {
systemd-boot.enable = true;
efi.canTouchEfiVariables = true;
};
# Define a user account. Don't forget to set a password with 'passwd'.
users.users.${common.username} = {
isNormalUser = true;
description = common.username;
extraGroups = [
"networkmanager"
"wheel"
];
};
# Allow unfree packages
nixpkgs.config.allowUnfree = true;
environment.sessionVariables = {
# Tells Electron apps to use Wayland
NIXOS_OZONE_WL = "1";
};
# List packages installed in system profile. To search, run:
# $ nix search wget
environment.systemPackages = with pkgs; [
wget
xdg-utils
xdg-desktop-portal
xdg-desktop-portal-gtk
unstable.protonmail-desktop
stremio
fastfetch
discord
nix-prefetch-github # Cmd to get rev and hash from GitHub
gimp
vlc
vdhcoapp
onlyoffice-desktopeditors
];
nix.settings.experimental-features = [
"nix-command"
"flakes"
];
programs.kdeconnect.enable = true;
services = {
flatpak.enable = false;
xserver.enable = true;
};
system.stateVersion = common.system.version;
}

389
flake.lock generated
View File

@ -49,11 +49,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1739283129,
"narHash": "sha256-GXJllf1wY7tOF6uei9S3PnSEghFbnJP1vkxM0kkMOoI=",
"lastModified": 1744793570,
"narHash": "sha256-BzulTVLpbapBxsJ1b1ZNPSg94YIbgs/75fNyiv2uWNg=",
"owner": "catppuccin",
"repo": "nix",
"rev": "d4e258e29075a86a82dacaf4f5e0985935ae4658",
"rev": "192378974a131c402633bee18dc892b804a663e0",
"type": "github"
},
"original": {
@ -62,125 +62,21 @@
"type": "github"
}
},
"devshell": {
"grayjay": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1735644329,
"narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=",
"owner": "numtide",
"repo": "devshell",
"rev": "f7795ede5b02664b57035b3b757876703e2c3eac",
"lastModified": 1744513122,
"narHash": "sha256-DPxL9yHkIvmNfpd49LeOOpT9NYrzHpgYbTO1yQg6Zh4=",
"owner": "rishabh5321",
"repo": "grayjay-flake",
"rev": "84accd21a2e69709040a0eea22fccdb743c9e64c",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"flake-compat": {
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"revCount": 69,
"type": "tarball",
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.1.0/01948eb7-9cba-704f-bbf3-3fa956735b52/source.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1738453229,
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"git-hooks": {
"inputs": {
"flake-compat": [
"nixvim",
"flake-compat"
],
"gitignore": "gitignore",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1737465171,
"narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
"nixvim",
"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",
"owner": "rishabh5321",
"repo": "grayjay-flake",
"type": "github"
}
},
@ -191,11 +87,11 @@
]
},
"locked": {
"lastModified": 1739570999,
"narHash": "sha256-eCc0/Q4bPpe4/AS+uzIrHLJcR6BxPQ69q2kD0/Qe6rU=",
"lastModified": 1744743431,
"narHash": "sha256-iyn/WBYDc7OtjSawbegINDe/gIkok888kQxk3aVnkgg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "254d47082e23dbf72fdeca1da6fe1da420f478d8",
"rev": "c61bfe3ae692f42ce688b5865fac9e0de58e1387",
"type": "github"
},
"original": {
@ -208,16 +104,16 @@
"home-manager_2": {
"inputs": {
"nixpkgs": [
"nixvim",
"zen-browser",
"nixpkgs"
]
},
"locked": {
"lastModified": 1738878603,
"narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=",
"lastModified": 1743604125,
"narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "433799271274c9f2ab520a49527ebfe2992dcfbd",
"rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a",
"type": "github"
},
"original": {
@ -229,16 +125,14 @@
"hyprpanel": {
"inputs": {
"ags": "ags",
"nixpkgs": [
"nixpkgs"
]
"nixpkgs": "nixpkgs_3"
},
"locked": {
"lastModified": 1739606511,
"narHash": "sha256-ywkv5Pm6p4Taavp3yX9SjoLVf/mIHS3fRXSHjXqaJHQ=",
"lastModified": 1744513377,
"narHash": "sha256-2ocy+qAVxTBmaK8MpAy7mpKIH+DYEzwf+KzXZX83oZ4=",
"owner": "Jas-SinghFSU",
"repo": "HyprPanel",
"rev": "c309a73d2d9821c90864447058b627c02bd82165",
"rev": "42943b3def85d8787d703778951944c8e791202b",
"type": "github"
},
"original": {
@ -247,62 +141,13 @@
"type": "github"
}
},
"ixx": {
"inputs": {
"flake-utils": [
"nixvim",
"nuschtosSearch",
"flake-utils"
],
"nixpkgs": [
"nixvim",
"nuschtosSearch",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729958008,
"narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
"owner": "NuschtOS",
"repo": "ixx",
"rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"ref": "v0.0.6",
"repo": "ixx",
"type": "github"
}
},
"nix-darwin": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1738743987,
"narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "ae406c04577ff9a64087018c79b4fdc02468c87c",
"type": "github"
},
"original": {
"owner": "lnl7",
"repo": "nix-darwin",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1736012469,
"narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
"lastModified": 1744098102,
"narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d",
"rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
"type": "github"
},
"original": {
@ -312,17 +157,33 @@
"type": "github"
}
},
"nixpkgs-unstable": {
"nixpkgs-stable": {
"locked": {
"lastModified": 1740560979,
"narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=",
"owner": "nixos",
"lastModified": 1744440957,
"narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5135c59491985879812717f4c9fea69604e7f26f",
"rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d",
"type": "github"
},
"original": {
"owner": "nixos",
"owner": "NixOS",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1744463964,
"narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
@ -330,27 +191,27 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1739357830,
"narHash": "sha256-9xim3nJJUFbVbJCz48UP4fGRStVW5nv4VdbimbKxJ3I=",
"owner": "nixos",
"lastModified": 1744463964,
"narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "0ff09db9d034a04acd4e8908820ba0b410d7a33a",
"rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-24.11",
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1735471104,
"narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
"lastModified": 1736344531,
"narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
"rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912",
"type": "github"
},
"original": {
@ -360,82 +221,85 @@
"type": "github"
}
},
"nixvim": {
"inputs": {
"devshell": "devshell",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts",
"git-hooks": "git-hooks",
"home-manager": "home-manager_2",
"nix-darwin": "nix-darwin",
"nixpkgs": [
"nixpkgs-unstable"
],
"nuschtosSearch": "nuschtosSearch",
"treefmt-nix": "treefmt-nix"
},
"nixpkgs_4": {
"locked": {
"lastModified": 1739527837,
"narHash": "sha256-dsb5iSthp5zCWhdV0aXPunFSCkS0pCvRXMMgTEFjzew=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "a39e0a651657046f3b936d842147fa51523b6818",
"lastModified": 1744440957,
"narHash": "sha256-FHlSkNqFmPxPJvy+6fNLaNeWnF1lZSgqVCl/eWaJRc4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "26d499fc9f1d567283d5d56fcf367edd815dba1d",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixvim",
"owner": "NixOS",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils",
"ixx": "ixx",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"nixpkgs_5": {
"locked": {
"lastModified": 1738508923,
"narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=",
"owner": "NuschtOS",
"repo": "search",
"rev": "86e2038290859006e05ca7201425ea5b5de4aecb",
"lastModified": 1743448293,
"narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"repo": "search",
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"catppuccin": "catppuccin",
"grayjay": "grayjay",
"home-manager": "home-manager",
"hyprpanel": "hyprpanel",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs_4",
"nixpkgs-stable": "nixpkgs-stable",
"nixpkgs-unstable": "nixpkgs-unstable",
"nixvim": "nixvim",
"sops-nix": "sops-nix",
"spicetify-nix": "spicetify-nix",
"zen-browser": "zen-browser"
}
},
"sops-nix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1744669848,
"narHash": "sha256-pXyanHLUzLNd3MX9vsWG+6Z2hTU8niyphWstYEP3/GU=",
"owner": "mic92",
"repo": "sops-nix",
"rev": "61154300d945f0b147b30d24ddcafa159148026a",
"type": "github"
},
"original": {
"owner": "mic92",
"repo": "sops-nix",
"type": "github"
}
},
"spicetify-nix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
"nixpkgs-unstable"
],
"systems": "systems_2"
"systems": "systems"
},
"locked": {
"lastModified": 1739223162,
"narHash": "sha256-YrbYTM0CkZQG38Ysr2gF4BYdsQDNQtQ4YdQTDgw/zWM=",
"lastModified": 1744682091,
"narHash": "sha256-zudMf0YW3mB0f2XnWPAjYdKioJPaJQchhO4bCeBOZAI=",
"owner": "Gerg-L",
"repo": "spicetify-nix",
"rev": "dea717737d04a2a3e877c082bfd2c7f91c1a33ff",
"rev": "44ed9eb751a6966ffb291edbda2e9bebd3ebcd4a",
"type": "github"
},
"original": {
@ -459,52 +323,17 @@
"type": "github"
}
},
"systems_2": {
"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": {
"inputs": {
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1738680491,
"narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "64dbb922d51a42c0ced6a7668ca008dded61c483",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"zen-browser": {
"inputs": {
"nixpkgs": "nixpkgs_3"
"home-manager": "home-manager_2",
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1740554227,
"narHash": "sha256-xpwZeMw2gGenixGQDyVv+ja+epcR+EJ1BPuGFdgFS18=",
"lastModified": 1744777359,
"narHash": "sha256-20REqJW54bbQIBuP19fcjPamV9mpWN0+RPcp5hQwwLI=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "7de16ae319e6f6852274fa90b0d41c00049767c9",
"rev": "d2bb30f451ef7802aca1954a6eb75efbc4c25872",
"type": "github"
},
"original": {

208
flake.nix
View File

@ -1,89 +1,181 @@
{
description = "NixOS configuration";
description = "Martin's NixOS configuration - Based on EmergentMind/nix-config";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
#
# ========= Official NixOS and HM Package Sources =========
#
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
# The next two are for pinning to stable vs unstable regardless of what the above is set to
# This is particularly useful when an upcoming stable release is in beta because you can effectively
# keep 'nixpkgs-stable' set to stable for critical packages while setting 'nixpkgs' to the beta branch to
# get a jump start on deprecation changes.
# See also 'stable-packages' and 'unstable-packages' overlays at 'overlays/default.nix"
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
catppuccin = {
url = "github:catppuccin/nix";
};
home-manager = {
url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs";
};
hyprpanel = {
url = "github:Jas-SinghFSU/HyprPanel";
#
# ========= Utilities =========
#
# Secrets management
sops-nix = {
url = "github:mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
nixvim = {
url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
# Catppuccin theming
catppuccin.url = "github:catppuccin/nix";
# Bar
hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
# Spotify
spicetify-nix = {
url = "github:Gerg-L/spicetify-nix";
inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs.follows = "nixpkgs-unstable";
};
# Browser
zen-browser.url = "github:0xc000022070/zen-browser-flake";
# Video aggregator
grayjay.url = "github:rishabh5321/grayjay-flake";
};
outputs =
inputs@{
self, # Get a ref to outputs
{
self,
nixpkgs,
nixpkgs-unstable,
home-manager,
...
}:
}@inputs:
let
system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system};
inherit (self) outputs;
common = import ./common.nix;
common = import ./shared/common.nix;
theme = import ./shared/theme.nix;
#
# ========= Architectures =========
#
forAllSystems = nixpkgs.lib.genAttrs [
"x86_64-linux"
"aarch64-linux"
];
# ========== Extend lib with lib.custom ==========
# NOTE: This approach allows lib.custom to propagate into hm
# see: https://github.com/nix-community/home-manager/pull/3454
customLib = (_self: _super: { custom = import ./lib { inherit (nixpkgs) lib; }; });
lib = nixpkgs.lib.extend customLib;
libHm = home-manager.lib.extend customLib;
systems = builtins.map (config: defaultAttrs // config) [
{
hostName = "desktop";
system = "x86_64-linux";
nvidia.enable = true;
}
{
hostName = "thinkpad";
system = "x86_64-linux";
}
{
hostName = "pi4";
system = "aarch64-linux";
wayland.enable = false;
}
# TODO Homelab config
];
defaultAttrs = {
username = common.username;
version = common.system.version;
wayland.enable = true;
nvidia.enable = false;
};
in
{
defaultPackage.${system} = home-manager.defaultPackage.${system};
#
# ========= Overlays =========
#
# Custom modifications/overrides to upstream packages
overlays = import ./overlays.nix { inherit inputs; };
# The minimum amount of dependencies in order to run 'just switch-now'
devShells.${system}.default = pkgs.mkShell {
packages = with pkgs; [
just
nh
];
};
# Adds the nix fmt command to format nix files
formatter.${system} = pkgs.nixfmt-rfc-style;
nixosConfigurations.${common.hostname} = nixpkgs.lib.nixosSystem {
system = system;
specialArgs = { inherit outputs inputs; }; # Pass args to modules
modules = [
./configuration.nix
home-manager.nixosModules.home-manager
#
# ========= Host Configurations =========
#
nixosConfigurations = builtins.listToAttrs (
builtins.map (
{
home-manager = {
# Backups conflicting files in case of error
backupFileExtension = "bkp";
useGlobalPkgs = true;
useUserPackages = true;
# Passes inputs as an argument to home-manager
extraSpecialArgs = { inherit inputs; };
users.${common.username} = import ./home-manager;
hostName,
system,
username,
...
}@systemConfig:
{
name = hostName;
value = nixpkgs.lib.nixosSystem {
inherit system;
specialArgs = {
inherit
outputs
inputs
common
theme
lib
systemConfig
;
isDarwin = false;
};
modules = [
./hosts/${hostName}
home-manager.nixosModules.home-manager
{
home-manager = {
# Backups conflicting files in case of error
backupFileExtension = "bkp";
useGlobalPkgs = true;
useUserPackages = true;
extraSpecialArgs = {
inherit
inputs
common
theme
libHm
systemConfig
;
};
users.${username} = import ./hosts/${hostName}/home-manager;
};
}
{
nixpkgs.overlays = with inputs; [
hyprpanel.overlay
];
}
];
};
}
./overlays.nix
];
};
) systems
);
overlays = {
# Gives access to unstable packages everywhere
unstable-packages = final: _prev: {
unstable = import nixpkgs-unstable {
system = final.system;
config.allowUnfree = true;
};
};
};
#
# ========= Formatting =========
#
# Nix formatter available through 'nix fmt' https://github.com/NixOS/nixfmt
formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.nixfmt-rfc-style);
#
# ========= DevShell =========
#
# Custom shell for bootstrapping on new hosts, modifying nix-config, and secrets management
devShells = forAllSystems (
system:
import ./shell.nix {
pkgs = nixpkgs.legacyPackages.${system};
}
);
};
}

View File

@ -1,69 +0,0 @@
{
pkgs,
inputs,
...
}:
let
common = import ../common.nix;
username = common.username;
dir = common.dir;
in
{
imports = [
inputs.catppuccin.homeManagerModules.catppuccin
./btop.nix
./cava
./cursors.nix
./default-applications.nix
./development
./fastfetch.nix
./fish.nix
./freetube.nix
./gtk.nix
./kitty.nix
./mpv.nix
./nextcloud.nix
./rofi
./wlogout
./hyprland
./spicetify.nix # TODO env conflict on latest version
./yazi
./zen
];
dconf = {
enable = true;
settings = {
# Prefer dark mode for all GTK apps
"org/gnome/desktop/interface".color-scheme = "prefer-dark";
};
};
home = {
username = username;
homeDirectory = dir.home;
sessionVariables = {
XDG_PICTURES_DIR = dir.pictures; # Define the default dir for pictures
};
# You can update Home Manager without changing this value. See
# the Home Manager release notes for a list of state version
# changes in each release.
stateVersion = common.system.version;
};
programs = {
btop.enable = true;
# Let Home Manager install and manage itself.
home-manager.enable = true;
};
services = {
gpg-agent = {
enable = true;
pinentryPackage = pkgs.pinentry-curses;
};
};
}

View File

@ -1,77 +0,0 @@
# Neovim configuration for Nix
{ inputs, ... }:
{
imports = [
inputs.nixvim.homeManagerModules.nixvim
];
catppuccin.nvim.enable = true;
home.sessionVariables.EDITOR = "nvim";
programs.nixvim = {
enable = true;
clipboard.providers.wl-copy.enable = true;
colorschemes.catppuccin.enable = true;
defaultEditor = true;
vimdiffAlias = true; # Alias vimdiff to nvim -d
opts = {
number = true; # Show line numbers
relativenumber = true; # Show relative line numbers
shiftwidth = 2; # Tab width should be 2
};
plugins = {
bufferline.enable = false;
# Formatters
conform-nvim = {
enable = true;
# TODO use nix fmt on save
settings = { };
};
lsp = {
enable = true;
servers = {
nixd.enable = true;
};
};
lualine.enable = true;
luasnip.enable = true;
# Completions
cmp = {
enable = true;
autoEnableSources = true;
# TODO complete on <tab>
settings = {
sources = [
{ name = "nvim-lsp"; }
{ name = "path"; }
{ name = "buffer"; }
];
};
};
treesitter.enable = true;
web-devicons.enable = true;
};
extraConfigLua = ''
-- Translucent background
vim.cmd [[
highlight Normal guibg=none
highlight NonText guibg=none
highlight Normal ctermbg=none
highlight NonText ctermbg=none
]]
'';
};
}

View File

@ -1,11 +0,0 @@
let
theme = import ../theme.nix;
in
{
gtk.enable = true;
catppuccin.gtk = {
enable = true;
flavor = theme.flavor;
icon.enable = true;
};
}

View File

@ -1,35 +0,0 @@
# Wallpapers
{ pkgs, ... }:
let
common = import ../../common.nix;
in
{
home.packages = with pkgs; [
hyprpaper
];
services.hyprpaper = {
enable = true;
settings =
let
wallpaperDir = ../../wallpapers;
monitor1 = "${wallpaperDir}/nixos_waves.png";
monitor2 = "${wallpaperDir}/ekg_v2.png";
in
{
ipc = "on";
splash = false;
splash_offset = 2.0;
preload = [
monitor1
monitor2
];
wallpaper = [
"${common.monitor1},${monitor1}"
"${common.monitor2},${monitor2}"
];
};
};
}

View File

@ -1,463 +0,0 @@
{ lib, ... }:
let
theme = import ../../../theme.nix;
in
{
services.swaync = {
enable = false;
style = lib.mkDefault ''
* {
all: unset;
font-size: 14px;
font-family: "${theme.nerdFont} Nerd Font", monospace;
transition: 200ms;
}
trough highlight {
background: #${theme.textAlpha};
}
scale trough {
margin: 0 1rem;
background-color: #${theme.surface0Alpha};
min-height: 8px;
min-width: 70px;
}
slider {
background-color: #${theme.blueAlpha};
}
.floating-notifications.background .notification-row .notification-background {
box-shadow:
0 0 8px 0 rgba(0, 0, 0, 0.8),
inset 0 0 0 1px #${theme.surface0Alpha};
border-radius: 12.6px;
margin: 18px;
background-color: #${theme.baseAlpha};
color: #${theme.textAlpha};
padding: 0;
}
.floating-notifications.background
.notification-row
.notification-background
.notification {
padding: 7px;
border-radius: 12.6px;
}
.floating-notifications.background
.notification-row
.notification-background
.notification.critical {
box-shadow: inset 0 0 7px 0 #${theme.redAlpha};
}
.floating-notifications.background
.notification-row
.notification-background
.notification
.notification-content {
margin: 7px;
}
.floating-notifications.background
.notification-row
.notification-background
.notification
.notification-content
.summary {
color: #${theme.textAlpha};
}
.floating-notifications.background
.notification-row
.notification-background
.notification
.notification-content
.time {
color: #${theme.subtext0Alpha};
}
.floating-notifications.background
.notification-row
.notification-background
.notification
.notification-content
.body {
color: #${theme.textAlpha};
}
.floating-notifications.background
.notification-row
.notification-background
.notification
> *:last-child
> * {
min-height: 3.4em;
}
.floating-notifications.background
.notification-row
.notification-background
.notification
> *:last-child
> *
.notification-action {
border-radius: 7px;
color: #${theme.textAlpha};
background-color: #${theme.surface0Alpha};
box-shadow: inset 0 0 0 1px #${theme.surface1Alpha};
margin: 7px;
}
.floating-notifications.background
.notification-row
.notification-background
.notification
> *:last-child
> *
.notification-action:hover {
box-shadow: inset 0 0 0 1px #${theme.surface1Alpha};
background-color: #${theme.surface0Alpha};
color: #${theme.textAlpha};
}
.floating-notifications.background
.notification-row
.notification-background
.notification
> *:last-child
> *
.notification-action:active {
box-shadow: inset 0 0 0 1px #${theme.surface1Alpha};
background-color: #${theme.sapphireAlpha};
color: #${theme.textAlpha};
}
/* Close Button */
.floating-notifications.background
.notification-row
.notification-background
.close-button {
margin: 7px;
padding: 2px;
border-radius: 6.3px;
color: #${theme.baseAlpha};
background-color: #${theme.redAlpha};
}
.floating-notifications.background
.notification-row
.notification-background
.close-button:hover {
background-color: #${theme.maroonAlpha};
color: #${theme.baseAlpha};
}
.floating-notifications.background
.notification-row
.notification-background
.close-button:active {
background-color: #${theme.redAlpha};
color: #${theme.baseAlpha};
}
.control-center {
box-shadow:
0 0 8px 0 rgba(0, 0, 0, 0.8),
inset 0 0 0 1px #${theme.surface0Alpha};
border-radius: 12.6px;
margin: 18px;
background-color: #${theme.baseAlpha};
color: #${theme.textAlpha};
padding: 14px;
}
.control-center .widget-title > label {
color: #${theme.textAlpha};
font-size: 1.3em;
}
.control-center .widget-title button {
border-radius: 7px;
color: #${theme.textAlpha};
background-color: #${theme.surface0Alpha};
box-shadow: inset 0 0 0 1px #${theme.surface1Alpha};
padding: 8px;
}
.control-center .widget-title button:hover {
box-shadow: inset 0 0 0 1px #${theme.surface1Alpha};
background-color: #585b70;
color: #${theme.textAlpha};
}
.control-center .widget-title button:active {
box-shadow: inset 0 0 0 1px #${theme.surface1Alpha};
background-color: #${theme.sapphireAlpha};
color: #${theme.baseAlpha};
}
.control-center .notification-row .notification-background {
border-radius: 7px;
color: #${theme.textAlpha};
background-color: #${theme.surface0Alpha};
box-shadow: inset 0 0 0 1px #${theme.surface1Alpha};
margin-top: 14px;
}
.control-center .notification-row .notification-background .notification {
padding: 7px;
border-radius: 7px;
}
.control-center
.notification-row
.notification-background
.notification.critical {
box-shadow: inset 0 0 7px 0 #${theme.redAlpha};
}
.control-center
.notification-row
.notification-background
.notification
.notification-content {
margin: 7px;
}
.control-center
.notification-row
.notification-background
.notification
.notification-content
.summary {
color: #${theme.textAlpha};
}
.control-center
.notification-row
.notification-background
.notification
.notification-content
.time {
color: #a6adc8;
}
.control-center
.notification-row
.notification-background
.notification
.notification-content
.body {
color: #${theme.textAlpha};
}
.control-center
.notification-row
.notification-background
.notification
> *:last-child
> * {
min-height: 3.4em;
}
.control-center
.notification-row
.notification-background
.notification
> *:last-child
> *
.notification-action {
border-radius: 7px;
color: #${theme.textAlpha};
background-color: #${theme.crustAlpha};
box-shadow: inset 0 0 0 1px #${theme.surface1Alpha};
margin: 7px;
}
.control-center
.notification-row
.notification-background
.notification
> *:last-child
> *
.notification-action:hover {
box-shadow: inset 0 0 0 1px #${theme.surface1Alpha};
background-color: #${theme.surface0Alpha};
color: #${theme.textAlpha};
}
.control-center
.notification-row
.notification-background
.notification
> *:last-child
> *
.notification-action:active {
box-shadow: inset 0 0 0 1px #${theme.surface1Alpha};
background-color: #${theme.sapphireAlpha};
color: #${theme.textAlpha};
}
.control-center .notification-row .notification-background .close-button {
margin: 7px;
padding: 2px;
border-radius: 6.3px;
color: #${theme.baseAlpha};
background-color: #${theme.maroonAlpha};
}
.close-button {
border-radius: 6.3px;
}
.control-center .notification-row .notification-background .close-button:hover {
background-color: #${theme.redAlpha};
color: #${theme.baseAlpha};
}
.control-center
.notification-row
.notification-background
.close-button:active {
background-color: #${theme.redAlpha};
color: #${theme.baseAlpha};
}
.control-center .notification-row .notification-background:hover {
box-shadow: inset 0 0 0 1px #${theme.surface1Alpha};
background-color: #${theme.overlay1Alpha};
color: #${theme.textAlpha};
}
.control-center .notification-row .notification-background:active {
box-shadow: inset 0 0 0 1px #${theme.surface1Alpha};
background-color: #${theme.sapphireAlpha};
color: #${theme.textAlpha};
}
.notification.critical progress {
background-color: #${theme.redAlpha};
}
.notification.low progress,
.notification.normal progress {
background-color: #${theme.blueAlpha};
}
.control-center-dnd {
margin-top: 5px;
border-radius: 8px;
background: #${theme.surface0Alpha};
border: 1px solid #${theme.surface1Alpha};
box-shadow: none;
}
.control-center-dnd:checked {
background: #${theme.surface0Alpha};
}
.control-center-dnd slider {
background: #${theme.surface1Alpha};
border-radius: 8px;
}
.widget-dnd {
margin: 0px;
font-size: 1.1rem;
}
.widget-dnd > switch {
font-size: initial;
border-radius: 8px;
background: #${theme.surface0Alpha};
border: 1px solid #${theme.surface1Alpha};
box-shadow: none;
}
.widget-dnd > switch:checked {
background: #${theme.surface0Alpha};
}
.widget-dnd > switch slider {
background: #${theme.surface1Alpha};
border-radius: 8px;
border: 1px solid #${theme.overlay0Alpha};
}
.widget-mpris .widget-mpris-player {
background: #${theme.surface0Alpha};
padding: 7px;
}
.widget-mpris .widget-mpris-title {
font-size: 1.2rem;
}
.widget-mpris .widget-mpris-subtitle {
font-size: 0.8rem;
}
.widget-menubar > box > .menu-button-bar > button > label {
font-size: 3rem;
padding: 0.5rem 2rem;
}
.widget-menubar > box > .menu-button-bar > :last-child {
color: #${theme.redAlpha};
}
.power-buttons button:hover,
.powermode-buttons button:hover,
.screenshot-buttons button:hover {
background: #${theme.surface0Alpha};
}
.control-center .widget-label > label {
color: #${theme.textAlpha};
font-size: 2rem;
}
.widget-buttons-grid {
padding-top: 1rem;
}
.widget-buttons-grid > flowbox > flowboxchild > button label {
font-size: 2.5rem;
}
.widget-volume {
padding-top: 1rem;
}
.widget-volume label {
font-size: 1.5rem;
color: #${theme.sapphireAlpha};
}
.widget-volume trough highlight {
background: #${theme.sapphireAlpha};
}
.widget-backlight trough highlight {
background: #${theme.yellowAlpha};
}
.widget-backlight label {
font-size: 1.5rem;
color: #${theme.yellowAlpha};
}
.widget-backlight .KB {
padding-bottom: 1rem;
}
.image {
padding-right: 0.5rem;
}
'';
};
}

View File

@ -1,108 +0,0 @@
{
"layer": "top",
// Waybar at top layer
"position": "top",
// Waybar position (top|bottom|left|right)
// "width": 1280, // Waybar width
// Choose the order of the modules
"modules-left": ["hyprland/workspaces", "custom/music"],
"modules-center": ["hyprland/window"],
"modules-right": [
"hyprland/language",
"wireplumber",
"backlight",
"clock",
"custom/notification",
"tray",
"custom/lock",
"custom/power"
],
"hyprland/workspaces": {
"disable-scroll": false,
"sort-by-name": true,
"format": " {id} "
},
"hyprland/window": {
"format": "{initialTitle}"
},
"tray": {
"icon-size": 21,
"spacing": 10
},
// TODO better music module
"custom/music": {
"format": "󰓃 {}",
"escape": true,
"interval": 5,
"tooltip": false,
"exec": "playerctl metadata --format='{{ title }}'",
"on-click": "playerctl play-pause",
"max-length": 50
},
"clock": {
"timezone": "Europe/Oslo",
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
"format": " {:%H:%M  %d/%m}",
"calendar": {
"mode": "month",
"weeks-pos": "left",
"format": {
"months": "<span color='#ffead3'><b>{}</b></span>",
"days": "<span color='#ecc6d9'><b>{}</b></span>",
"weeks": "<span color='#99ffdd'><b>W{}</b></span>",
"weekdays": "<span color='#ffcc66'><b>{}</b></span>",
"today": "<span color='#ff6699'><b><u>{}</u></b></span>"
}
}
},
"backlight": {
"device": "intel_backlight",
"format": "{icon}",
"format-icons": ["", "", "", "", "", "", "", "", ""]
},
"wireplumber": {
// "scroll-step": 1, // %, can be a float
"format": "{icon} {volume}%",
"format-muted": " ",
"format-icons": {
"default": ["", " ", " "]
},
"on-click": "pavucontrol"
},
"hyprland/language": {
"format-en": "EN",
"format-no": "NO",
"keyboard-name": "logitech-logitech-g710-keyboard",
"on-click": "hyprctl switchxkblayout logitech-logitech-g710-keyboard next"
},
"custom/lock": {
"tooltip": false,
"on-click": "sh -c '(sleep 0.5s; hyprlock)'",
"format": ""
},
"custom/power": {
"tooltip": false,
"on-click": "wlogout &",
"format": " "
},
"custom/notification": {
"tooltip": false,
"format": "{icon}",
"format-icons": {
"notification": "<span foreground='#f38ba8'><sup></sup></span>",
"none": "",
"dnd-notification": "<span foreground='#f38ba8'><sup></sup></span>",
"dnd-none": "",
"inhibited-notification": "<span foreground='#f38ba8'><sup></sup></span>",
"inhibited-none": "",
"dnd-inhibited-notification": "<span foreground='#f38ba8'><sup></sup></span>",
"dnd-inhibited-none": ""
},
"return-type": "json",
"exec-if": "which swaync-client",
"exec": "swaync-client -swb",
"on-click": "swaync-client -t -sw",
"on-click-right": "swaync-client -d -sw",
"escape": true
}
}

View File

@ -1,37 +0,0 @@
/*
*
* Catppuccin Mocha palette
* Maintainer: rubyowo
*
*/
@define-color base #1e1e2e;
@define-color mantle #181825;
@define-color crust #11111b;
@define-color text #cdd6f4;
@define-color subtext0 #a6adc8;
@define-color subtext1 #bac2de;
@define-color surface0 #313244;
@define-color surface1 #45475a;
@define-color surface2 #585b70;
@define-color overlay0 #6c7086;
@define-color overlay1 #7f849c;
@define-color overlay2 #9399b2;
@define-color blue #89b4fa;
@define-color lavender #b4befe;
@define-color sapphire #74c7ec;
@define-color sky #89dceb;
@define-color teal #94e2d5;
@define-color green #a6e3a1;
@define-color yellow #f9e2af;
@define-color peach #fab387;
@define-color maroon #eba0ac;
@define-color red #f38ba8;
@define-color mauve #cba6f7;
@define-color pink #f5c2e7;
@define-color flamingo #f2cdcd;
@define-color rosewater #f5e0dc;

View File

@ -1,104 +0,0 @@
@import "mocha.css";
* {
font-family: JetBrainsMono Nerd Font;
font-size: 15px;
min-height: 0;
}
#waybar {
background: transparent;
color: @text;
margin: 5px 5px;
}
#workspaces {
border-radius: 1rem;
background-color: @surface0;
margin: 5px 5px 5px 1rem;
}
#workspaces button {
color: @lavender;
border-radius: 1rem;
padding: 0.4rem;
}
#workspaces button.active {
color: @sky;
border-radius: 1rem;
}
#workspaces button:hover {
color: @sapphire;
border-radius: 1rem;
}
#language,
#window,
#custom-notification,
#custom-music,
#tray,
#backlight,
#clock,
#wireplumber,
#custom-lock,
#custom-power {
background-color: @surface0;
padding: 0.5rem 1rem;
margin: 5px 0;
}
#clock {
color: @blue;
}
#backlight {
color: @yellow;
}
#backlight {
border-radius: 0;
}
#language {
color: @red;
border-radius: 1rem 0 0 1rem;
margin-left: 1rem;
}
#wireplumber {
color: @maroon;
}
#custom-music {
color: @mauve;
border-radius: 1rem;
}
#window {
color: @mauve;
border-radius: 1rem;
}
#custom-lock {
border-radius: 1rem 0 0 1rem;
color: @lavender;
}
#custom-power {
margin-right: 1rem;
border-radius: 0 1rem 1rem 0;
color: @red;
}
#custom-notification {
margin-right: 1rem;
border-radius: 0 1rem 1rem 0;
color: @sapphire;
}
#tray {
margin-right: 1rem;
border-radius: 1rem;
}

View File

@ -1,6 +0,0 @@
{
home.file.".config/waybar" = {
source = ./config;
recursive = true;
};
}

Binary file not shown.

View File

@ -1,6 +0,0 @@
lib:
{
loadSecret =
filePath: lib.strings.trim (lib.strings.removeSuffix "\n" (builtins.readFile filePath));
}

View File

@ -1,116 +0,0 @@
# Log out and shutdown menu
{
home.file =
let
dir = ".config/wlogout";
in
{
"${dir}/hibernate.svg".source = ./hibernate.svg;
"${dir}/lock.svg".source = ./lock.svg;
"${dir}/logout.svg".source = ./logout.svg;
"${dir}/reboot.svg".source = ./reboot.svg;
"${dir}/shutdown.svg".source = ./shutdown.svg;
"${dir}/suspend.svg".source = ./suspend.svg;
};
programs.wlogout = {
enable = false;
layout = [
{
label = "lock";
action = "sh -c '(sleep 0.5s; hyprlock)'";
text = "Lock";
keybind = "l";
}
{
label = "hibernate";
action = "systemctl hibernate";
text = "Hibernate";
keybind = "h";
}
{
label = "logout";
action = "loginctl terminate-user $USER";
text = "Logout";
keybind = "e";
}
{
label = "shutdown";
action = "systemctl poweroff";
text = "Shutdown";
keybind = "s";
}
{
label = "suspend";
action = "systemctl suspend";
text = "Suspend";
keybind = "u";
}
{
label = "reboot";
action = "systemctl reboot";
text = "Reboot";
keybind = "r";
}
];
style =
let
theme = import ../../theme.nix;
in
''
* {
background-image: none;
box-shadow: none;
}
window {
background-color: rgba(30, 30, 46, 0.9);
}
button {
border-radius: 0;
border-color: #${theme.pinkAlpha};
text-decoration-color: #${theme.textAlpha};
color: #${theme.textAlpha};
background-color: #${theme.mantleAlpha};
border-style: solid;
border-width: 1px;
background-repeat: no-repeat;
background-position: center;
background-size: 25%;
}
button:focus,
button:active,
button:hover {
/* 20% Overlay 2, 80% mantle */
background-color: rgb(48, 50, 66);
outline-style: none;
}
#lock {
background-image: url("./lock.svg");
}
#logout {
background-image: url("./logout.svg");
}
#suspend {
background-image: url("./suspend.svg");
}
#hibernate {
background-image: url("./hibernate.svg");
}
#shutdown {
background-image: url("./shutdown.svg");
}
#reboot {
background-image: url("./reboot.svg");
}
'';
};
}

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Svg Vector Icons : http://www.onlinewebfonts.com/icon -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg fill="#f5c2e7" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
<metadata> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
<g><g><path d="M500,10C229.4,10,10,229.4,10,500s219.4,490,490,490s490-219.4,490-490S770.6,10,500,10z M500,885.1c-212.7,0-385.1-172.4-385.1-385.1S287.3,114.9,500,114.9S885.1,287.3,885.1,500S712.7,885.1,500,885.1z M576.5,308.7v382.4c0,42.2-34.2,76.5-76.5,76.5c-42.3,0-76.5-34.2-76.5-76.5V308.7c0-42.2,34.2-76.5,76.5-76.5C542.2,232.3,576.5,266.5,576.5,308.7z"/></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g><g></g></g>
</svg>

Before

Width:  |  Height:  |  Size: 969 B

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Svg Vector Icons : http://www.onlinewebfonts.com/icon -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg fill="#f5c2e7" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
<metadata> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
<g><g><path d="M321.8,455.5h356.4V321.8c0-49.2-17.4-91.2-52.2-126c-34.8-34.8-76.8-52.2-126-52.2c-49.2,0-91.2,17.4-126,52.2c-34.8,34.8-52.2,76.8-52.2,126L321.8,455.5L321.8,455.5z M900.9,522.3v400.9c0,18.6-6.5,34.3-19.5,47.3c-13,13-28.8,19.5-47.3,19.5H165.9c-18.6,0-34.3-6.5-47.3-19.5s-19.5-28.8-19.5-47.3V522.3c0-18.6,6.5-34.3,19.5-47.3c13-13,28.8-19.5,47.3-19.5h22.3V321.8c0-85.4,30.6-158.7,91.9-219.9C341.3,40.6,414.6,10,500,10c85.4,0,158.7,30.6,219.9,91.9c61.3,61.3,91.9,134.6,91.9,219.9v133.6h22.3c18.6,0,34.3,6.5,47.3,19.5C894.4,487.9,900.9,503.7,900.9,522.3L900.9,522.3z"/></g></g>
</svg>

Before

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Svg Vector Icons : http://www.onlinewebfonts.com/icon -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg fill="#f5c2e7" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
<metadata> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
<g><path d="M622.5,990H50.8C26.3,990,10,973.7,10,949.2V50.8C10,26.3,26.3,10,50.8,10h571.7c24.5,0,40.8,16.3,40.8,40.8v285.8c0,24.5-16.3,40.8-40.8,40.8s-40.8-16.3-40.8-40.8v-245h-490v816.7h490v-245c0-24.5,16.3-40.8,40.8-40.8s40.8,16.3,40.8,40.8v285.8C663.3,973.7,647,990,622.5,990z"/><path d="M949.2,540.8H336.7c-24.5,0-40.8-16.3-40.8-40.8c0-24.5,16.3-40.8,40.8-40.8h612.5c24.5,0,40.8,16.3,40.8,40.8C990,524.5,973.7,540.8,949.2,540.8z"/><path d="M949.2,540.8c-12.3,0-20.4-4.1-28.6-12.3L757.3,365.3c-16.3-16.3-16.3-40.8,0-57.2c16.3-16.3,40.8-16.3,57.2,0l163.3,163.3c16.3,16.3,16.3,40.8,0,57.2C969.6,536.8,961.4,540.8,949.2,540.8z"/><path d="M785.8,704.2c-12.3,0-20.4-4.1-28.6-12.3c-16.3-16.3-16.3-40.8,0-57.2l163.3-163.3c16.3-16.3,40.8-16.3,57.2,0c16.3,16.3,16.3,40.8,0,57.2L814.4,691.9C806.3,700.1,798.1,704.2,785.8,704.2z"/></g>
</svg>

Before

Width:  |  Height:  |  Size: 1.3 KiB

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Svg Vector Icons : http://www.onlinewebfonts.com/icon -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg fill="#f5c2e7" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
<metadata> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
<g><path d="M134.6,285.6C64.9,420.7,60.1,590,137.1,723.4L42,668.5l-32,55.4c93.1,52.1,133.6,75.9,184,106.2c28.5-51.5,52.8-94.4,107.4-186.1L246,612l-53.4,92.5C65.4,502.7,167.2,200.3,398.8,126.2C638,29.3,929,223.5,931.5,481.5c19.6,236.7-208.9,443.6-439.3,416.2l-29.5,51c277.7,54.4,556.5-201.7,524.7-483.1C976.1,170.8,637.1-41.2,367.1,77.5C262.8,114.2,183.1,191.5,134.6,285.6z"/></g>
</svg>

Before

Width:  |  Height:  |  Size: 877 B

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Svg Vector Icons : http://www.onlinewebfonts.com/icon -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg fill="#f5c2e7" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
<metadata> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
<g><path d="M764,152.1c30.9,22,58.3,46.8,82.4,74.6c24,27.8,44.6,57.8,61.8,90.1c17.2,32.3,30.2,66.4,39.1,102.4c8.9,36,13.4,72.6,13.4,109.6c0,63.8-12.2,123.7-36.5,179.6c-24.4,55.9-57.3,104.7-98.8,146.2c-41.5,41.5-90.2,74.5-146.2,98.8C623.2,977.8,563.3,990,499.5,990c-63.1,0-122.7-12.2-178.6-36.5c-55.9-24.4-104.8-57.3-146.7-98.8c-41.9-41.5-74.8-90.2-98.8-146.2c-24-55.9-36-115.8-36-179.6c0-36.4,4.3-72.1,12.9-107.1c8.6-35,20.8-68.3,36.5-99.9c15.8-31.6,35.3-61.1,58.7-88.5c23.3-27.5,49.4-52.2,78.2-74.1c15.1-11,31.4-15.1,48.9-12.4c17.5,2.7,31.7,11.3,42.7,25.7c11,14.4,15.1,30.5,12.4,48.4c-2.7,17.8-11.3,32.3-25.7,43.2c-43.2,31.6-76.4,70.3-99.3,116.3c-23,46-34.5,95.4-34.5,148.2c0,45.3,8.6,88,25.7,128.2c17.2,40.1,40.7,75.1,70.5,105c29.9,29.9,64.9,53.5,105,71c40.1,17.5,82.9,26.3,128.2,26.3c45.3,0,88-8.7,128.2-26.3c40.1-17.5,75.1-41.2,105-71s53.5-64.9,71-105c17.5-40.1,26.3-82.9,26.3-128.2c0-53.5-12.4-104.1-37.1-151.8c-24.7-47.7-59.4-87-104-117.9c-15.1-10.3-24.2-24.4-27.3-42.2c-3.1-17.8,0.5-34.3,10.8-49.4c10.3-14.4,24.4-23.2,42.2-26.2C732.5,138.2,748.9,141.8,764,152.1L764,152.1z M499.5,531.9c-17.8,0-33.1-6.3-45.8-19c-12.7-12.7-19-28-19-45.8V75.9c0-17.8,6.3-33.3,19-46.3c12.7-13,28-19.6,45.8-19.6c18.5,0,34.1,6.5,46.8,19.6c12.7,13,19,28.5,19,46.3v391.2c0,17.8-6.3,33.1-19,45.8C533.6,525.6,518,531.9,499.5,531.9L499.5,531.9z"/></g>
</svg>

Before

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -1,53 +0,0 @@
* {
background-image: none;
box-shadow: none;
}
window {
background-color: rgba(30, 30, 46, 0.9);
}
button {
border-radius: 0;
border-color: #f5c2e7;
text-decoration-color: #cdd6f4;
color: #cdd6f4;
background-color: #181825;
border-style: solid;
border-width: 1px;
background-repeat: no-repeat;
background-position: center;
background-size: 25%;
}
button:focus,
button:active,
button:hover {
/* 20% Overlay 2, 80% mantle */
background-color: rgb(48, 50, 66);
outline-style: none;
}
#lock {
background-image: url("./lock.svg");
}
#logout {
background-image: url("./logout.svg");
}
#suspend {
background-image: url("./suspend.svg");
}
#hibernate {
background-image: url("./hibernate.svg");
}
#shutdown {
background-image: url("./shutdown.svg");
}
#reboot {
background-image: url("./reboot.svg");
}

View File

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Svg Vector Icons : http://www.onlinewebfonts.com/icon -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg fill="#f5c2e7" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 1000 1000" enable-background="new 0 0 1000 1000" xml:space="preserve">
<metadata> Svg Vector Icons : http://www.onlinewebfonts.com/icon </metadata>
<g><path d="M500,990c-66.1,0-130.3-13-190.7-38.5c-58.4-24.7-110.8-60-155.7-105s-80.3-97.4-105-155.7C23,630.3,10,566.1,10,500c0-66.1,13-130.3,38.5-190.7c24.7-58.4,60-110.8,105-155.7c45-45,97.4-80.3,155.7-105C369.7,23,433.9,10,500,10c66.1,0,130.3,13,190.7,38.5c58.4,24.7,110.8,60,155.7,105c45,45,80.3,97.4,105,155.7C977,369.7,990,433.9,990,500c0,66.1-13,130.3-38.5,190.7c-24.7,58.4-60,110.8-105,155.7s-97.4,80.3-155.7,105C630.3,977,566.1,990,500,990z M500,79.6c-112.3,0-217.9,43.7-297.3,123.1C123.3,282.1,79.6,387.7,79.6,500s43.7,217.9,123.1,297.3c79.4,79.4,185,123.1,297.3,123.1c112.3,0,217.9-43.7,297.3-123.1c79.4-79.4,123.1-185,123.1-297.3s-43.7-217.9-123.1-297.3C717.9,123.3,612.3,79.6,500,79.6z"/><path d="M322.5,290.6h108v412h-108V290.6z"/><path d="M561.6,290.6h107.9v412H561.6V290.6z"/></g>
</svg>

Before

Width:  |  Height:  |  Size: 1.3 KiB

File diff suppressed because it is too large Load Diff

View File

@ -1,327 +0,0 @@
{ lib, ... }:
let
theme = import ../../theme.nix;
batTheme = ".config/yazi/catppuccin-${theme.flavor}.tmTheme";
in
{
home.file.${batTheme}.source = ./catppuccin-mocha.tmTheme;
programs.yazi = {
enable = true;
settings = {
manager = {
ratio = [
2
4
2
];
sort_by = "natural";
sort_sensitive = true;
sort_reverse = false;
sort_dir_first = true;
linemode = "none";
show_hidden = true;
show_symlink = true;
};
preview = {
image_filter = "lanczos3";
image_quality = 90;
tab_size = 1;
max_width = 600;
max_height = 900;
cache_dir = "";
ueberzug_scale = 1;
ueberzug_offset = [
0
0
0
0
];
};
tasks = {
micro_workers = 5;
macro_workers = 10;
bizarre_retry = 5;
};
};
theme = lib.mkForce {
manager = {
cwd = {
fg = "#${theme.tealAlpha}";
};
hovered = {
fg = "#${theme.baseAlpha}";
bg = "#${theme.blueAlpha}";
};
preview_hovered = {
fg = "#${theme.baseAlpha}";
bg = "#${theme.textAlpha}";
};
find_keyword = {
fg = "#${theme.yellowAlpha}";
italic = true;
};
find_position = {
fg = "#${theme.pinkAlpha}";
bg = "reset";
italic = true;
};
marker_copied = {
fg = "#${theme.greenAlpha}";
bg = "#${theme.greenAlpha}";
};
marker_cut = {
fg = "#${theme.redAlpha}";
bg = "#${theme.redAlpha}";
};
marker_marked = {
fg = "#${theme.tealAlpha}";
bg = "#${theme.tealAlpha}";
};
marker_selected = {
fg = "#${theme.blueAlpha}";
bg = "#${theme.blueAlpha}";
};
tab_active = {
fg = "#${theme.baseAlpha}";
bg = "#${theme.textAlpha}";
};
tab_inactive = {
fg = "#${theme.textAlpha}";
bg = "#${theme.surface1Alpha}";
};
tab_width = 1;
count_copied = {
fg = "#${theme.baseAlpha}";
bg = "#${theme.greenAlpha}";
};
count_cut = {
fg = "#${theme.baseAlpha}";
bg = "#${theme.redAlpha}";
};
count_selected = {
fg = "#${theme.baseAlpha}";
bg = "#${theme.blueAlpha}";
};
border_symbol = "";
border_style.fg = "#${theme.overlay1Alpha}";
syntect_theme = "~/${batTheme}";
};
mode = {
normal_main = {
fg = "#${theme.baseAlpha}";
bg = "#${theme.blueAlpha}";
bold = true;
};
normal_alt = {
fg = "#${theme.blueAlpha}";
bg = "#${theme.surface0Alpha}";
};
select_main = {
fg = "#${theme.baseAlpha}";
bg = "#${theme.greenAlpha}";
bold = true;
};
select_alt = {
fg = "#${theme.greenAlpha}";
bg = "#${theme.surface0Alpha}";
};
unset_main = {
fg = "#${theme.baseAlpha}";
bg = "#${theme.flamingoAlpha}";
bold = true;
};
unset_alt = {
fg = "#${theme.flamingoAlpha}";
bg = "#${theme.surface0Alpha}";
};
};
status = {
separator_open = "";
separator_close = "";
progress_label = {
fg = "#ffffff";
bold = true;
};
progress_normal = {
fg = "#${theme.blueAlpha}";
bg = "#${theme.surface1Alpha}";
};
progress_error = {
fg = "#${theme.redAlpha}";
bg = "#${theme.surface1Alpha}";
};
perm_type = {
fg = "#${theme.blueAlpha}";
};
perm_read = {
fg = "#${theme.yellowAlpha}";
};
perm_write = {
fg = "#${theme.redAlpha}";
};
perm_exec = {
fg = "#${theme.greenAlpha}";
};
perm_sep = {
fg = "#${theme.overlay1Alpha}";
};
};
input = {
border = {
fg = "#${theme.blueAlpha}";
};
title = { };
value = { };
selected.reversed = true;
};
pick = {
border = {
fg = "#${theme.blueAlpha}";
};
active = {
fg = "#${theme.pinkAlpha}";
};
inactive = { };
};
confirm = {
border = {
fg = "#${theme.blueAlpha}";
};
title = {
fg = "#${theme.blueAlpha}";
};
content = { };
list = { };
btn_yes = {
reversed = true;
};
btn_no = { };
};
completion = {
border = {
fg = "#${theme.blueAlpha}";
};
};
tasks = {
border = {
fg = "#${theme.blueAlpha}";
};
title = { };
hovered = {
underline = true;
};
};
which = {
mask = {
bg = "#${theme.surface0Alpha}";
};
cand = {
fg = "#${theme.tealAlpha}";
};
rest = {
fg = "#9399b2";
};
desc = {
fg = "#${theme.pinkAlpha}";
};
separator = " ";
separator_style = {
fg = "#${theme.surface2Alpha}";
};
};
help = {
on = {
fg = "#${theme.tealAlpha}";
};
run = {
fg = "#${theme.pinkAlpha}";
};
desc = {
fg = "#9399b2";
};
hovered = {
bg = "#${theme.surface2Alpha}";
bold = true;
};
footer = {
fg = "#${theme.textAlpha}";
bg = "#${theme.surface1Alpha}";
};
};
notify = {
title_info = {
fg = "#${theme.tealAlpha}";
};
title_warn = {
fg = "#${theme.yellowAlpha}";
};
title_error = {
fg = "#${theme.redAlpha}";
};
};
filetype = {
rules = [
# Media
{
mime = "image/*";
fg = "#${theme.tealAlpha}";
}
{
mime = "{audio;video}/*";
fg = "#${theme.yellowAlpha}";
}
# Archives
{
mime = "application/*zip";
fg = "#${theme.pinkAlpha}";
}
{
mime = "application/x-{tar;bzip*;7z-compressed;xz;rar}";
fg = "#${theme.pinkAlpha}";
}
# Documents
{
mime = "application/{pdf;doc;rtf}";
fg = "#${theme.greenAlpha}";
}
# Fallback
{
name = "*";
fg = "#${theme.textAlpha}";
}
{
name = "*/";
fg = "#${theme.blueAlpha}";
}
];
};
icon = import ./icons.nix;
};
};
}

File diff suppressed because it is too large Load Diff

View File

@ -1,12 +0,0 @@
{ pkgs, inputs, ... }:
{
# TODO programatically get default name
home = {
file.".zen/audtxq7n.default/chrome" = {
source = ./chrome;
recursive = true;
};
packages = with pkgs; [ inputs.zen-browser.packages.${system}.default ]; # Beta
};
}

4
hosts/desktop/common.nix Normal file
View File

@ -0,0 +1,4 @@
{
monitor1 = "DP-1";
monitor2 = "DP-3";
}

11
hosts/desktop/default.nix Normal file
View File

@ -0,0 +1,11 @@
{
lib,
...
}:
{
imports = [
(lib.custom.relativeToRoot "shared/modules")
./hardware-configuration.nix
];
}

View File

@ -1,10 +1,6 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{
config,
lib,
pkgs,
modulesPath,
...
}:

View File

@ -0,0 +1,14 @@
{
lib,
...
}:
{
imports = [
(lib.custom.relativeToRoot "shared/home-manager")
./hyprpaper.nix
./settings.nix
];
programs.git.signing.key = "706F53DD087A91DE";
}

View File

@ -0,0 +1,29 @@
# Wallpapers
{
lib,
theme,
...
}:
{
services.hyprpaper.settings =
let
wallpaper1 = builtins.toString theme.wallpaper.monitor1;
wallpaper2 = builtins.toString theme.wallpaper.monitor2;
in
{
preload = lib.mkForce [
wallpaper1
wallpaper2
];
wallpaper =
let
common = import ../common.nix;
in
lib.mkForce [
"${common.monitor1},${wallpaper1}"
"${common.monitor2},${wallpaper2}"
];
};
}

View File

@ -0,0 +1,12 @@
{ lib, ... }:
{
wayland.windowManager.hyprland.settings.monitor =
let
common = import ../common.nix;
in
lib.mkForce [
"${common.monitor1}, 3440x1440@175, 0x0, 1"
"${common.monitor2}, 3840x2160@60, 3440x0, 1.5, transform, 1"
];
}

View File

Before

Width:  |  Height:  |  Size: 568 B

After

Width:  |  Height:  |  Size: 568 B

View File

@ -0,0 +1,7 @@
{
# TODO merge with shared
home.file.".zen/audtxq7n.default/chrome" = {
source = ./chrome;
recursive = true;
};
}

16
hosts/pi4/boot.nix Normal file
View File

@ -0,0 +1,16 @@
{ pkgs, ... }:
{
boot = {
kernelPackages = pkgs.linuxKernel.packages.linux_rpi4;
initrd.availableKernelModules = [
"xhci_pci"
"usbhid"
"usb_storage"
];
loader = {
grub.enable = false;
generic-extlinux-compatible.enable = true;
};
};
}

31
hosts/pi4/default.nix Normal file
View File

@ -0,0 +1,31 @@
{
lib,
config,
systemConfig,
...
}:
{
imports = with lib.custom; [
(relativeToRoot "shared/modules/nix-helper.nix")
(relativeToRoot "shared/modules/nixos.nix")
(relativeToRoot "shared/modules/shell.nix")
(relativeToRoot "shared/modules/security/sops.nix")
./boot.nix
./development.nix
./hardware.nix
./networking.nix
./security
];
system.stateVersion = systemConfig.version;
users = {
mutableUsers = false;
users.${systemConfig.username} = {
isNormalUser = true;
hashedPasswordFile = config.sops.secrets.password.path;
extraGroups = [ "wheel" ];
};
};
}

11
hosts/pi4/development.nix Normal file
View File

@ -0,0 +1,11 @@
{ pkgs, lib, ... }:
{
imports = [
(lib.custom.relativeToRoot "shared/modules/development/formatters.nix")
];
environment.systemPackages = with pkgs; [
just
];
}

12
hosts/pi4/hardware.nix Normal file
View File

@ -0,0 +1,12 @@
{
fileSystems = {
"/" = {
device = "/dev/disk/by-label/NIXOS_SD";
fsType = "ext4";
options = [ "noatime" ];
};
# TODO mount ext hdd
};
hardware.enableRedistributableFirmware = true;
}

View File

@ -0,0 +1,33 @@
{
lib,
inputs,
outputs,
systemConfig,
...
}:
{
imports = [
inputs.catppuccin.homeModules.catppuccin
(lib.custom.relativeToRoot "shared/home-manager/development/git.nix")
(lib.custom.relativeToRoot "shared/home-manager/development/helix.nix")
(lib.custom.relativeToRoot "shared/home-manager/shell/btop.nix")
(lib.custom.relativeToRoot "shared/home-manager/shell/eza.nix")
(lib.custom.relativeToRoot "shared/home-manager/shell/fastfetch.nix")
(lib.custom.relativeToRoot "shared/home-manager/shell/fish.nix")
(lib.custom.relativeToRoot "shared/home-manager/shell/zoxide.nix")
(lib.custom.relativeToRoot "shared/home-manager/gpg.nix")
];
home.stateVersion = systemConfig.version;
# Adds pkgs.unstable in order to fetch packages from unstable repositories
nixpkgs.overlays = [ outputs.overlays.unstable-packages ];
programs = {
git.signing.key = "E3FA0E995C0D0E5E";
# Let Home Manager install and manage itself.
home-manager.enable = true;
};
}

13
hosts/pi4/networking.nix Normal file
View File

@ -0,0 +1,13 @@
{ systemConfig, ... }:
{
networking = {
hostName = systemConfig.hostName;
networkmanager.enable = true;
};
services = {
openssh.enable = true;
tailscale.enable = true;
};
}

View File

@ -0,0 +1,14 @@
{
imports = [
./firewall.nix
];
programs.gnupg.agent = {
enable = true;
enableSSHSupport = true;
};
services = {
pcscd.enable = true;
gnome.gnome-keyring.enable = true;
};
}

View File

@ -0,0 +1,17 @@
{
networking = {
firewall = {
enable = true;
trustedInterfaces = [ "tailscale0" ];
extraInputRules =
let
localIPv4Range = "192.168.10.0/24";
in
''
ip saddr ${localIPv4Range} tcp dport 22 accept
ip saddr ${localIPv4Range} udp dport 22 accept
'';
};
nftables.enable = true;
};
}

View File

@ -0,0 +1,6 @@
{
services = {
upower.enable = true;
power-profiles-daemon.enable = true;
};
}

View File

@ -0,0 +1,14 @@
{ pkgs, ... }:
{
environment.systemPackages = [
pkgs.bluez
];
hardware.bluetooth = {
enable = true;
powerOnBoot = true; # powers up the default Bluetooth controller on boot
};
services.blueman.enable = true;
}

View File

@ -0,0 +1,4 @@
{
# Empty matches all monitors
monitor1 = "";
}

View File

@ -0,0 +1,23 @@
{
pkgs,
lib,
...
}:
{
imports = [
(lib.custom.relativeToRoot "shared/modules")
./battery.nix
./bluetooth.nix
./hardware-configuration.nix
./security.nix
];
boot.kernelPackages = pkgs.linuxPackages_latest;
environment.systemPackages = with pkgs; [
brightnessctl
hyprsunset # Blue light filter
];
}

View File

@ -0,0 +1,57 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{
config,
lib,
pkgs,
modulesPath,
...
}:
{
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [
"nvme"
"xhci_pci"
"usb_storage"
"sd_mod"
"sdhci_pci"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
fileSystems."/" = {
device = "/dev/disk/by-uuid/5ac9c425-35ae-47d5-a683-68ee0dbfc2bc";
fsType = "ext4";
};
boot.initrd.luks.devices."luks-99b73f22-3fa1-42b5-ad48-54b0ccff72cc".device =
"/dev/disk/by-uuid/99b73f22-3fa1-42b5-ad48-54b0ccff72cc";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/3CFB-D12A";
fsType = "vfat";
options = [
"fmask=0077"
"dmask=0077"
];
};
swapDevices = [ ];
# 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
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp2s0f0.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

View File

@ -0,0 +1,14 @@
{
lib,
...
}:
{
imports = [
(lib.custom.relativeToRoot "shared/home-manager")
./hyprland
./zen
];
programs.git.signing.key = "848D71DE0590C199";
}

View File

@ -0,0 +1,8 @@
# Home configurations for Hyprland. For system configs, see ./modules/hyprland
{
imports = [
./hyprlock.nix
./hyprpanel.nix
./settings.nix
];
}

View File

@ -0,0 +1,15 @@
{ pkgs, lib, ... }:
{
# TODO fingerprint prompt using $FPRINTPROMPT
programs.hyprlock = {
package = pkgs.unstable.hyprlock;
settings = {
auth."fingerprint:enabled" = true;
# Override removed settings shared config
general = lib.mkForce {
hide_cursor = true;
};
};
};
}

View File

@ -0,0 +1,16 @@
{
lib,
...
}:
{
programs.hyprpanel.settings.layout."bar.layouts"."*".right = lib.mkForce [
"kbinput"
"volume"
"network"
"systray"
"clock"
"battery"
"notifications"
];
}

View File

@ -0,0 +1,33 @@
{
lib,
...
}:
{
wayland.windowManager.hyprland.settings = {
monitor =
let
common = import ../../common.nix;
in
lib.mkForce [
"${common.monitor1}, 1920x1080@60.05, 0x0, 1"
];
# Autostart
exec-once = [
"hyprsunset -t 5000" # Set blue light filter
];
input = {
sensitivity = lib.mkForce 0.4; # -1.0 - 1.0, 0 means no modification.
touchpad.natural_scroll = lib.mkForce true;
};
gestures = {
workspace_swipe = lib.mkForce true;
workspace_swipe_distance = lib.mkForce 150;
workspace_swipe_min_speed_to_force = lib.mkForce 0;
workspace_swipe_cancel_ratio = lib.mkForce 0.5;
};
};
}

View File

@ -0,0 +1,113 @@
/* Catppuccin Mocha Blue userChrome.css*/
@media (prefers-color-scheme: dark) {
:root {
--zen-colors-primary: #313244 !important;
--zen-primary-color: #89b4fa !important;
--zen-colors-secondary: #313244 !important;
--zen-colors-tertiary: #181825 !important;
--zen-colors-border: #89b4fa !important;
--toolbarbutton-icon-fill: #89b4fa !important;
--lwt-text-color: #cdd6f4 !important;
--toolbar-field-color: #cdd6f4 !important;
--tab-selected-textcolor: rgb(171, 197, 247) !important;
--toolbar-field-focus-color: #cdd6f4 !important;
--toolbar-color: #cdd6f4 !important;
--newtab-text-primary-color: #cdd6f4 !important;
--arrowpanel-color: #cdd6f4 !important;
--arrowpanel-background: #1e1e2e !important;
--sidebar-text-color: #cdd6f4 !important;
--lwt-sidebar-text-color: #cdd6f4 !important;
--lwt-sidebar-background-color: #11111b !important;
--toolbar-bgcolor: #313244 !important;
--newtab-background-color: #1e1e2e !important;
--zen-themed-toolbar-bg: #181825 !important;
--zen-main-browser-background: #181825 !important;
}
#permissions-granted-icon {
color: #181825 !important;
}
.sidebar-placesTree {
background-color: #1e1e2e !important;
}
#zen-workspaces-button {
background-color: #1e1e2e !important;
}
#TabsToolbar {
background-color: #181825 !important;
}
#urlbar-background {
background-color: #1e1e2e !important;
}
.content-shortcuts {
background-color: #1e1e2e !important;
border-color: #89b4fa !important;
}
.urlbarView-url {
color: #89b4fa !important;
}
#zenEditBookmarkPanelFaviconContainer {
background: #11111b !important;
}
toolbar .toolbarbutton-1 {
&:not([disabled]) {
&:is([open], [checked])
> :is(
.toolbarbutton-icon,
.toolbarbutton-text,
.toolbarbutton-badge-stack
) {
fill: #11111b;
}
}
}
.identity-color-blue {
--identity-tab-color: #89b4fa !important;
--identity-icon-color: #89b4fa !important;
}
.identity-color-turquoise {
--identity-tab-color: #94e2d5 !important;
--identity-icon-color: #94e2d5 !important;
}
.identity-color-green {
--identity-tab-color: #a6e3a1 !important;
--identity-icon-color: #a6e3a1 !important;
}
.identity-color-yellow {
--identity-tab-color: #f9e2af !important;
--identity-icon-color: #f9e2af !important;
}
.identity-color-orange {
--identity-tab-color: #fab387 !important;
--identity-icon-color: #fab387 !important;
}
.identity-color-red {
--identity-tab-color: #f38ba8 !important;
--identity-icon-color: #f38ba8 !important;
}
.identity-color-pink {
--identity-tab-color: #f5c2e7 !important;
--identity-icon-color: #f5c2e7 !important;
}
.identity-color-purple {
--identity-tab-color: #cba6f7 !important;
--identity-icon-color: #cba6f7 !important;
}
}

View File

@ -0,0 +1,158 @@
/* Catppuccin Mocha Blue userContent.css*/
@media (prefers-color-scheme: dark) {
/* Common variables affecting all pages */
@-moz-document url-prefix("about:") {
:root {
--in-content-page-color: #cdd6f4 !important;
--color-accent-primary: #89b4fa !important;
--color-accent-primary-hover: rgb(163, 197, 251) !important;
--color-accent-primary-active: rgb(138, 153, 250) !important;
background-color: #1e1e2e !important;
--in-content-page-background: #1e1e2e !important;
}
}
/* Variables and styles specific to about:newtab and about:home */
@-moz-document url("about:newtab"), url("about:home") {
:root {
--newtab-background-color: #1e1e2e !important;
--newtab-background-color-secondary: #313244 !important;
--newtab-element-hover-color: #313244 !important;
--newtab-text-primary-color: #cdd6f4 !important;
--newtab-wordmark-color: #cdd6f4 !important;
--newtab-primary-action-background: #89b4fa !important;
}
.icon {
color: #89b4fa !important;
}
.search-wrapper .logo-and-wordmark .logo {
background:
url("zen-logo-mocha.svg"),
url("https://raw.githubusercontent.com/IAmJafeth/zen-browser/main/themes/Mocha/Blue/zen-logo-mocha.svg")
no-repeat center !important;
display: inline-block !important;
height: 82px !important;
width: 82px !important;
background-size: 82px !important;
}
@media (max-width: 609px) {
.search-wrapper .logo-and-wordmark .logo {
background-size: 64px !important;
height: 64px !important;
width: 64px !important;
}
}
.card-outer:is(:hover, :focus, .active):not(.placeholder) .card-title {
color: #89b4fa !important;
}
.top-site-outer .search-topsite {
background-color: #89b4fa !important;
}
.compact-cards .card-outer .card-context .card-context-icon.icon-download {
fill: #a6e3a1 !important;
}
}
/* Variables and styles specific to about:preferences */
@-moz-document url-prefix("about:preferences") {
:root {
--zen-colors-tertiary: #181825 !important;
--in-content-text-color: #cdd6f4 !important;
--link-color: #89b4fa !important;
--link-color-hover: rgb(163, 197, 251) !important;
--zen-colors-primary: #313244 !important;
--in-content-box-background: #313244 !important;
--zen-primary-color: #89b4fa !important;
}
groupbox,
moz-card {
background: #1e1e2e !important;
}
button,
groupbox menulist {
background: #313244 !important;
color: #cdd6f4 !important;
}
.main-content {
background-color: #11111b !important;
}
.identity-color-blue {
--identity-tab-color: #8aadf4 !important;
--identity-icon-color: #8aadf4 !important;
}
.identity-color-turquoise {
--identity-tab-color: #8bd5ca !important;
--identity-icon-color: #8bd5ca !important;
}
.identity-color-green {
--identity-tab-color: #a6da95 !important;
--identity-icon-color: #a6da95 !important;
}
.identity-color-yellow {
--identity-tab-color: #eed49f !important;
--identity-icon-color: #eed49f !important;
}
.identity-color-orange {
--identity-tab-color: #f5a97f !important;
--identity-icon-color: #f5a97f !important;
}
.identity-color-red {
--identity-tab-color: #ed8796 !important;
--identity-icon-color: #ed8796 !important;
}
.identity-color-pink {
--identity-tab-color: #f5bde6 !important;
--identity-icon-color: #f5bde6 !important;
}
.identity-color-purple {
--identity-tab-color: #c6a0f6 !important;
--identity-icon-color: #c6a0f6 !important;
}
}
/* Variables and styles specific to about:addons */
@-moz-document url-prefix("about:addons") {
:root {
--zen-dark-color-mix-base: #181825 !important;
--background-color-box: #1e1e2e !important;
}
}
/* Variables and styles specific to about:protections */
@-moz-document url-prefix("about:protections") {
:root {
--zen-primary-color: #1e1e2e !important;
--social-color: #cba6f7 !important;
--coockie-color: #89dceb !important;
--fingerprinter-color: #f9e2af !important;
--cryptominer-color: #b4befe !important;
--tracker-color: #a6e3a1 !important;
--in-content-primary-button-background-hover: rgb(81, 83, 105) !important;
--in-content-primary-button-text-color-hover: #cdd6f4 !important;
--in-content-primary-button-background: #45475a !important;
--in-content-primary-button-text-color: #cdd6f4 !important;
}
.card {
background-color: #313244 !important;
}
}
}

View File

@ -0,0 +1,13 @@
<svg width="1024" height="1024" viewBox="0 0 1024 1024" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_15_9)">
<rect width="1024" height="1024" rx="225" fill="#11111b"/>
<circle cx="512" cy="512" r="340" stroke="#cdd6f4" stroke-width="70"/>
<circle cx="512" cy="512" r="224.915" stroke="#cdd6f4" stroke-width="51"/>
<circle cx="512" cy="512" r="129.018" stroke="#cdd6f4" stroke-width="31"/>
</g>
<defs>
<clipPath id="clip0_15_9">
<rect width="1024" height="1024" fill="white"/>
</clipPath>
</defs>
</svg>

After

Width:  |  Height:  |  Size: 568 B

View File

@ -0,0 +1,7 @@
{
# TODO merge with shared
home.file.".zen/xdaxqlov.default/chrome" = {
source = ./chrome;
recursive = true;
};
}

View File

@ -0,0 +1,38 @@
{ pkgs, ... }:
{
security = {
pam.services = {
gdm-fingerprint.text = ''
auth required pam_shells.so
auth requisite pam_nologin.so
auth requisite pam_faillock.so preauth
auth required ${pkgs.fprintd}/lib/security/pam_fprintd.so
auth optional pam_permit.so
auth required pam_env.so
auth [success=ok default=1] ${pkgs.gdm}/lib/security/pam_gdm.so
auth optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so
account include login
password required pam_deny.so
session include login
session optional ${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so auto_start
'';
login.fprintAuth = false;
};
};
# Start the driver at boot
systemd.services.fprintd = {
wantedBy = [ "multi-user.target" ];
serviceConfig.Type = "simple";
};
# Install the driver
services.fprintd = {
enable = true;
tod.driver = pkgs.libfprint-2-tod1-goodix-550a; # Goodix 550a driver (from Lenovo)
};
}

View File

@ -1,28 +1,49 @@
# List all receipes
default:
@just --list
# Format all files in repo
fmt:
treefmt --on-unmatched info
# Build a specific host but don't activate it. Host must use same system as target system
build HOST:
git add .
just fmt
nh os build . -H {{HOST}}
# Switch to new config, but don't add to bootloader
test *FLAGS:
git add .
just fmt
nh os test . {{FLAGS}}
# Add new configuration to bootloader, but don't activate it now
boot *FLAGS:
git add .
just fmt
nh os test . {{FLAGS}}
# Switch to new config and add to bootloader
switch *FLAGS:
git add .
just fmt
nh os switch . {{FLAGS}}
# Switch to new config and add to bootloader without formatting or adding to git
switch-now *FLAGS:
nh os switch . {{FLAGS}}
update:
update-all:
nix-channel --update
nix flake update
just switch
update PKG:
nix flake update {{PKG}}
just switch
# Encrypt all files in the repo using git-crypt
lock:
git-crypt lock
@ -30,3 +51,28 @@ lock:
# Decrypt all files in the repo using git-crypt and the user's GPG key
unlock:
git-crypt unlock ~/.config/git/crypt-key
# Connect to tailnet or sign-in if not registered
start-tailscale:
tailscale up --login-server https://vpn.martials.no
# Generate a new SSH key without passphrase
generate-ssh:
ssh-keygen -t ed25519 -a 32 -f ~/.ssh/id_ed25519 -P ""
# Generate a new age key from an existing ssh key (without passphrase)
generate-age-from-ssh:
mkdir -p ~/.config/sops/age
nix run nixpkgs#ssh-to-age -- -private-key -i ~/.ssh/id_ed25519 > ~/.config/sops/age/keys.txt
# Get a public age key from an existing age private key
get-public-age-key:
nix shell nixpkgs#age -c age-keygen -y ~/.config/sops/age/keys.txt
# Edit the SOPS secrets file
edit-secrets:
nix run nixpkgs#sops -- shared/secrets/secrets.yaml
# Hash a string using the mkpasswd command
hash PASS:
echo "{{PASS}}" | mkpasswd -s

24
lib/default.nix Normal file
View File

@ -0,0 +1,24 @@
# FIXME(lib.custom): Add some stuff from hmajid2301/dotfiles/lib/module/default.nix, as simplifies option declaration
{ lib, ... }:
{
getSecret = with lib.strings; filePath: trim (removeSuffix "\n" (builtins.readFile filePath));
# use path relative to the root of the project
relativeToRoot = lib.path.append ../.;
scanPaths =
path:
builtins.map (f: (path + "/${f}")) (
builtins.attrNames (
lib.attrsets.filterAttrs (
path: _type:
(_type == "directory") # include directories
|| (
(path != "default.nix") # ignore default.nix
&& (lib.strings.hasSuffix ".nix" path) # include .nix files
)
) (builtins.readDir path)
)
);
}

View File

@ -1,17 +0,0 @@
{
imports = [
./development.nix
./fonts.nix
./gaming
./gnome
./hardware
./locale.nix
./networking.nix
./nix-helper.nix
./hyprland
./sddm.nix
./security.nix
./shell.nix
./qt.nix
];
}

View File

@ -1,42 +0,0 @@
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
# IDEs
jetbrains.rust-rover
jetbrains.webstorm
jetbrains.rider
vscodium # TODO set up extensions
# Tools
dotnet-sdk_9
dotnet-aspnetcore_9
git
rustup
nodejs_22
pnpm
just
gcc # Required for C, Rust and others
# Language servers
nixd
nil
# Formatters
nixfmt-rfc-style
treefmt
nodePackages.prettier
shfmt
];
virtualisation.docker = {
enable = true;
storageDriver = "btrfs";
rootless = {
enable = true;
setSocketVariable = true;
};
};
services.ollama = {
enable = true;
acceleration = "cuda";
};
}

View File

@ -1,23 +0,0 @@
{ pkgs, ... }:
{
environment.systemPackages = with pkgs; [
font-awesome # Icons
];
fonts =
let
theme = import ../theme.nix;
in
{
fontconfig.enable = true;
packages = with pkgs; [
(nerdfonts.override { fonts = [ theme.nerdFont ]; })
jetbrains-mono
# The line below will replace the lines above in 25.05
# nerd-fonts.jetbrains-mono
font-awesome
];
};
}

View File

@ -1,7 +1,11 @@
{ inputs, ... }:
{
nixpkgs.overlays = with inputs; [
hyprpanel.overlay
];
# Gives access to unstable packages everywhere
unstable-packages = final: _prev: {
unstable = import inputs.nixpkgs-unstable {
system = final.system;
config.allowUnfree = true;
};
};
}

View File

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View File

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

View File

Before

Width:  |  Height:  |  Size: 808 KiB

After

Width:  |  Height:  |  Size: 808 KiB

View File

Before

Width:  |  Height:  |  Size: 2.1 MiB

After

Width:  |  Height:  |  Size: 2.1 MiB

View File

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 50 KiB

View File

Before

Width:  |  Height:  |  Size: 282 KiB

After

Width:  |  Height:  |  Size: 282 KiB

View File

Before

Width:  |  Height:  |  Size: 102 KiB

After

Width:  |  Height:  |  Size: 102 KiB

View File

@ -3,7 +3,7 @@ rec {
browser = "zen";
calculator = "gnome-calculator";
fileManager = "nautilus";
imageViewer = "loupe";
imageViewer = "imv";
lockScreen = "hyprlock";
terminal = "kitty";
};
@ -13,19 +13,15 @@ rec {
pictures = "${dir.home}/Pictures";
};
hostname = "nixos";
keymaps = {
layout = "gb,no";
options = "grp:alt_shift_toggle"; # Toggle using ALT + SHIFT
};
# Empty matches all
monitor1 = "DP-1";
monitor2 = "DP-3";
username = "martin";
root = ../.;
# This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions
# on your system were taken. It's perfectly fine and recommended to leave

View File

@ -1,6 +1,5 @@
let
theme = import ../theme.nix;
in
{ theme, ... }:
{
catppuccin.cursors = {
enable = true;

View File

@ -1,12 +1,11 @@
# TODO more defaults
{
xdg.mimeApps = {
enable = true;
defaultApplications =
let
browser = "zen.desktop";
imageViewer = "org.gnome.Loupe.desktop";
pdfReader = "org.gnome.Papers.desktop";
imageViewer = "imv.desktop";
pdfReader = "sioyek.desktop";
in
{
"text/html" = browser;

View File

@ -0,0 +1,50 @@
{
inputs,
outputs,
common,
systemConfig,
...
}:
let
dir = common.dir;
in
{
imports = [
inputs.catppuccin.homeModules.catppuccin
./cursors.nix
./default-applications.nix
./development
./freetube.nix
./gtk.nix
./gpg.nix
./kitty.nix
./media
./nextcloud.nix
./rofi
./hyprland
./shell
./sioyek.nix
./spicetify.nix
./zen
];
home = {
username = systemConfig.username;
homeDirectory = dir.home;
sessionVariables = {
XDG_PICTURES_DIR = dir.pictures; # Define the default dir for pictures
};
# You can update Home Manager without changing this value. See
# the Home Manager release notes for a list of state version
# changes in each release.
stateVersion = systemConfig.version;
};
# Adds pkgs.unstable in order to fetch packages from unstable repositories
nixpkgs.overlays = [ outputs.overlays.unstable-packages ];
# Let Home Manager install and manage itself.
programs.home-manager.enable = true;
}

View File

@ -1,7 +1,7 @@
{
imports = [
./git.nix
./nixvim
./helix.nix
./zed.nix
];
# TODO set Wayland vmOptions in Jetbrains products, Requires current installed version in path

View File

@ -1,7 +1,10 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [ git-crypt ];
home.packages = with pkgs; [
git-crypt
gitmoji-cli
];
programs.git =
let
@ -17,14 +20,13 @@
amend = "commit --amend";
cm = "commit";
s = "status";
p = "push";
};
signing = {
signByDefault = true;
key = "706F53DD087A91DE";
};
signing.signByDefault = true;
extraConfig = {
pull.rebase = true;
push.autoSetupRemote = true;
safe.directory = "/etc/nixos";
credential.helper = "${package}/bin/git-credential-libsecret";

View File

@ -0,0 +1,130 @@
{
pkgs,
lib,
theme,
...
}:
{
catppuccin.helix = {
enable = true;
flavor = theme.flavor;
};
programs = {
fish.shellAliases.edit = "hx";
helix = {
enable = true;
defaultEditor = true;
extraPackages = with pkgs; [
# Markdown
marksman
markdown-oxide
# Html, css, Json, Eslint
vscode-langservers-extracted
# Yaml
ansible-language-server
yaml-language-server
];
settings = {
editor = {
auto-save = {
after-delay.enable = true;
focus-lost = true;
};
cursor-shape = {
normal = "block";
insert = "bar";
select = "underline";
};
lsp = {
display-inlay-hints = true;
display-messages = true;
};
};
keys.normal = {
C-f = ":format";
};
};
languages.language = [
{
name = "css";
formatter = {
command = "prettier";
args = [
"--stdin-filepath"
"file.css"
];
};
auto-format = true;
}
{
name = "json";
language-servers = [
{
name = "vscode-json-language-server";
except-features = [ "format" ];
}
];
formatter = {
command = "prettier";
args = [
"--stdin-filepath"
"file.json"
];
};
auto-format = true;
}
{
name = "jsonc";
language-servers = [
{
name = "vscode-json-language-server";
except-features = [ "format" ];
}
];
formatter = {
command = "prettier";
args = [
"--stdin-filepath"
"file.jsonc"
];
};
file-types = [
"jsonc"
];
auto-format = true;
}
{
name = "markdown";
formatter = {
command = "prettier";
args = [
"--stdin-filepath"
"file.md"
];
};
auto-format = true;
}
{
name = "nix";
formatter.command = lib.getExe pkgs.nixfmt-rfc-style;
auto-format = true;
}
{
name = "yaml";
formatter = {
command = "prettier";
args = [
"--stdin-filepath"
"file.yaml"
];
};
auto-format = true;
}
];
};
};
}

View File

@ -1,4 +1,4 @@
{ pkgs, ... }:
{ pkgs, theme, ... }:
{
programs.zed-editor = {
@ -15,7 +15,6 @@
];
userSettings =
let
theme = import ../../theme.nix;
font = "${theme.nerdFont} Nerd Font";
fontSize = 14;
in
@ -28,17 +27,17 @@
version = "2";
};
autosave = "on_focus_change";
auto_update = false;
base_keymap = "JetBrains";
buffer_font_family = font;
features = {
inline_completion_provider = "zed";
edit_completion_provider = "zed";
};
icon_theme = {
mode = theme.mode;
light = "Catppuccin Latte";
dark = "Catppuccin Mocha";
};
icon_theme = "Catppuccin Mocha";
# icon_theme = { TODO replace icon theme above with below
# mode = theme.mode;
# light = "Catppuccin Mocha";
# dark = "Catppuccin Mocha";
# };
ui_font_family = font;
ui_font_size = fontSize;
buffer_font_size = fontSize;

View File

@ -0,0 +1,10 @@
{ pkgs, ... }:
{
programs.gpg.enable = true;
services.gpg-agent = {
enable = true;
enableFishIntegration = true;
pinentryPackage = pkgs.pinentry-curses;
};
}

View File

@ -0,0 +1,20 @@
{ theme, ... }:
{
# TODO deprecated, remove
catppuccin.gtk = {
enable = true;
flavor = theme.flavor;
icon.enable = true;
};
dconf = {
enable = true;
settings = {
# Prefer dark mode for all GTK apps
"org/gnome/desktop/interface".color-scheme = "prefer-dark";
};
};
gtk.enable = true;
}

View File

@ -1,9 +1,8 @@
{ common, ... }:
let
common = import ../../common.nix;
app = common.default;
in
{
# TODO binds to move focused window
wayland.windowManager.hyprland.settings = {
"$mainMod" = "SUPER";
"$shiftMod" = "$mainMod SHIFT";

View File

@ -1,22 +1,15 @@
# Home configurations for Hyprland. For system configs, see ./modules/hyprland
{ outputs, ... }:
# Home configurations for Hyprland. For system configs, see ./shared/modules/hyprland
{
imports = [
./binds.nix
./waybar
./hypridle
./hyprlock
./hyprpanel
./hyprpaper.nix
./hyprshot.nix
./settings.nix
./swaync
];
# Adds pkgs.unstable in order to fetch packages from unstable repositories
nixpkgs.overlays = [ outputs.overlays.unstable-packages ];
wayland.windowManager.hyprland = {
enable = true;
systemd.variables = [ "--all" ]; # Import environment into systemd

View File

@ -1,7 +1,5 @@
{ lib, ... }:
let
theme = import ../../../theme.nix;
in
{ theme, ... }:
{
programs.hyprlock = {
enable = true;
@ -10,13 +8,13 @@ in
background = [
{
path = "${../../../wallpapers/catppuccin_page_curl.png}";
path = "${theme.wallpaper.lockscreen}";
}
];
# GENERAL
general = {
disable_loading_bar = true;
disable_loading_bar = true; # TODO removed in hyprlock 0.8
hide_cursor = true;
};
@ -55,7 +53,7 @@ in
# USER AVATAR
image = {
path = "${../../face.png}";
path = builtins.toString theme.avatar.image;
size = 100;
border_color = "${theme.blueRgb}";
position = "0, 75";
@ -70,16 +68,16 @@ in
dots_size = 0.2;
dots_spacing = 0.2;
dots_center = true;
outer_color = lib.mkDefault "${theme.blueRgb}";
inner_color = lib.mkDefault "${theme.surface0Rgb}";
font_color = lib.mkDefault "${theme.textRgb}";
outer_color = "${theme.blueRgb}";
inner_color = "${theme.surface0Rgb}";
font_color = "${theme.textRgb}";
fade_on_empty = false;
placeholder_text = "<span foreground=\"##${theme.textAlpha}\">󰌾 Logged in as <span foreground=\"##${theme.blueAlpha}\">$USER</span></span>";
hide_input = false;
check_color = lib.mkDefault "${theme.blueRgb}";
fail_color = lib.mkDefault "${theme.redRgb}";
check_color = "${theme.blueRgb}";
fail_color = "${theme.redRgb}";
fail_text = "<i>$FAIL <b>($ATTEMPTS)</b></i>";
capslock_color = lib.mkDefault "${theme.yellowRgb}";
capslock_color = "${theme.yellowRgb}";
position = "0, -47"; # TODO change to use % at 25.05
halign = "center";
valign = "center";

View File

@ -1,14 +1,12 @@
{
pkgs,
inputs,
common,
theme,
lib,
...
}:
let
common = import ../../../common.nix;
theme = import ../../../theme.nix;
loader = import ../../secretsLoader.nix lib;
in
{
imports = [ inputs.hyprpanel.homeManagerModules.hyprpanel ];
@ -19,34 +17,15 @@ in
# Fix the overwrite issue with HyprPanel.
overwrite.enable = true;
# Import a theme from './themes/*.json'.
theme = "";
# Override the final config with an arbitrary set.
# Useful for overriding colors in your selected theme.
# Default: {}
# TODO fixes theming bugs in recent versions, should be removed when fixed
override = {
theme.bar.menus.text = "#123ABC";
};
# Configure bar layouts for monitors.
layout = {
"bar.layouts" = {
"*" = {
left = [
"dashboard"
"workspaces"
"windowtitle"
];
middle = [ "media" ];
right = [
"kbinput"
"volume"
"network"
"systray"
"clock"
"notifications"
];
theme = {
bar.transparent = true;
font = {
name = "${theme.nerdFont} NF";
size = "15px";
};
};
};
@ -62,16 +41,42 @@ in
customModules.kbLayout.leftClick = "hyprctl switchxkblayout keychron-keychron-k8-pro next";
launcher.autoDetectIcon = true;
network.label = false;
volume = {
scrollDown = "${pkgs.hyprpanel}/bin/hyprpanel 'vol -1'";
scrollUp = "${pkgs.hyprpanel}/bin/hyprpanel 'vol +1'";
};
volume =
let
step = "1";
in
{
scrollDown = "${pkgs.hyprpanel}/bin/hyprpanel 'vol -${step}'";
scrollUp = "${pkgs.hyprpanel}/bin/hyprpanel 'vol +${step}'";
};
workspaces = {
show_icons = false;
show_numbered = true;
};
};
# Configure bar layouts for monitors.
layout = {
"bar.layouts" = {
"*" = {
left = [
"dashboard"
"workspaces"
"windowtitle"
];
middle = [ "media" ];
right = [
"kbinput"
"volume"
"network"
"systray"
"clock"
"notifications"
];
};
};
};
menus = {
clock = {
time = {
@ -81,18 +86,18 @@ in
weather = {
unit = "metric";
location = "Bergen, Norway";
key = loader.loadSecret ../../secrets/weather-api-key;
key = with lib.custom; getSecret (relativeToRoot "shared/secrets/weather-api-key");
};
};
dashboard = {
directories.enabled = false;
powermenu.avatar.image = "${../../face.png}";
powermenu.avatar.image = "${theme.avatar.image}";
shortcuts.left = {
shortcut1 = {
command = common.default.browser;
icon = ""; # TODO replace with Zen icon
tooltip = "Zen";
tooltip = "Zen Browser";
};
shortcut2 = {
command = "spotify";

View File

@ -0,0 +1,31 @@
# Wallpapers
{
pkgs,
theme,
...
}:
{
home.packages = with pkgs; [ hyprpaper ];
services.hyprpaper = {
enable = true;
settings =
let
defaultWallpaper = builtins.toString theme.wallpaper.default;
in
{
ipc = "on";
splash = false;
splash_offset = 2.0;
preload = [
defaultWallpaper
];
wallpaper = [
",${defaultWallpaper}"
];
};
};
}

View File

@ -1,6 +1,5 @@
let
common = import ../../common.nix;
in
{ common, ... }:
{
wayland.windowManager.hyprland.settings = {
"$mainMod" = "SUPER";

View File

@ -1,14 +1,16 @@
{ lib, ... }:
{
lib,
common,
theme,
...
}:
let
common = import ../../common.nix;
theme = import ../../theme.nix;
app = common.default;
in
{
wayland.windowManager.hyprland.settings = {
monitor = [
"${common.monitor1}, 3440x1440@175, 0x0, 1"
"${common.monitor2}, 3840x2160@60, 3440x0, 1.5, transform, 1"
", preferred, auto, 1"
];
# Autostart

View File

@ -1,7 +1,5 @@
let
common = import ../common.nix;
theme = import ../theme.nix;
in
{ common, theme, ... }:
{
catppuccin.kitty = {
enable = true;

View File

@ -0,0 +1,6 @@
{
imports = [
./imv.nix
./mpv.nix
];
}

View File

@ -0,0 +1,10 @@
{ theme, ... }:
{
catppuccin.imv = {
enable = true;
flavor = theme.flavor;
};
programs.imv.enable = true;
}

View File

@ -1,12 +1,10 @@
{ theme, ... }:
{
catppuccin.mpv =
let
theme = import ../theme.nix;
in
{
enable = true;
flavor = theme.flavor;
};
catppuccin.mpv = {
enable = true;
flavor = theme.flavor;
};
programs = {
fish.shellAliases.mpvl = "mpv --profile=loop";

Some files were not shown because too many files have changed in this diff Show More