Toast/nix-stuff
1
0
Fork 0
Code Issues Pull requests Projects 1 Wiki Activity

Compare commits

base: Toast:6f59bd3d6d4ccb73e07df8ffae0f93689c1b4dbb
Branches Tags
Toast:main
Toast:plasma-refactor
Toast:headscale
Toast:plasma6
Toast:catppuccin
Toast:kde-stuff
Toast:firefox
Toast:upgrade-to-23.05
...
compare: Toast:455790a5b1aa4c287e7604a3026119ee97ced06b
Branches Tags
Toast:main
Toast:plasma-refactor
Toast:headscale
Toast:plasma6
Toast:catppuccin
Toast:kde-stuff
Toast:firefox
Toast:upgrade-to-23.05

6 commits
6f59bd3d6d ... 455790a5b1

Author SHA1 Message Date
Toast
455790a5b1 Desktop: install JamesDSP 2023-08-30 00:57:53 +02:00
Toast
7765c2a550 Archie: use pipewire as the sound server again 2023-08-30 00:56:29 +02:00
Toast
a0d2ba5c70 Flake: update lock file 2023-08-30 00:54:54 +02:00
Toast
0a358a8643 KeepassXC: install with users.users.<>-packages instead of home manager 2023-08-30 00:36:38 +02:00
Toast
638cf16a41 Kate: install system-wide 2023-08-30 00:32:27 +02:00
Toast
100a4df006 Flake: add nix-diff to devShell 2023-08-30 00:16:37 +02:00
7 changed files with 48 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

30
flake.lock generated
View file

@ -50,11 +50,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1692503956, "lastModified": 1693187908,
"narHash": "sha256-MOA6FKc1YgfGP3ESnjSYfsyJ1BXlwV5pGlY/u5XdJfY=", "narHash": "sha256-cTcNpsqi1llmUFl9bmCdD0mTyfjhBrNFPhu2W12WXzA=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "958c06303f43cf0625694326b7f7e5475b1a2d5c", "rev": "8bde7a651b94ba30bd0baaa9c4a08aae88cc2e92",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -70,11 +70,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1692099905, "lastModified": 1693208669,
"narHash": "sha256-/pSusGhmIdSdAaywQRFA5dVbfdIzlWQTecM+E46+cJ0=", "narHash": "sha256-hHFaaUsZ860wvppPeiu7nJn/nXZjJfnqAQEu9SPFE9I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2a6679aa9cc3872c29ba2a57fe1b71b3e3c5649f", "rev": "5bac4a1c06cd77cf8fc35a658ccb035a6c50cd2c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -101,11 +101,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1692373088, "lastModified": 1692952286,
"narHash": "sha256-EPgCecdc9I8aTdmDNoO1l7R72r2WPhZRcesV4nzxBj8=", "narHash": "sha256-TsrtPv3+Q1KR0avZxpiJH+b6fX/R/hEQVHbjl1ebotY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "7f1836531b126cfcf584e7d7d71bf8758bb58969", "rev": "817e297fc3352fadc15f2c5306909aa9192d7d97",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -117,11 +117,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1692525914, "lastModified": 1693231525,
"narHash": "sha256-MUgZ9/9mE/EbEQA6JPdcQHkjoR5fgvaKhpy6UO67uEc=", "narHash": "sha256-Zmh8m0HHcgGBDth6jdJPmc4UAAP0L4jQmqIztywF1Iw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "475d5ae2c4cb87b904545bdb547af05681198fcc", "rev": "c540061ac8d72d6e6d99345bd2d590c82b2f58c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -132,11 +132,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1692447944, "lastModified": 1693250523,
"narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=", "narHash": "sha256-y3up5gXMTbnCsXrNEB5j+7TVantDLUYyQLu/ueiXuyg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d680ded26da5cf104dd2735a51e88d2d8f487b4d", "rev": "3efb0f6f404ec8dae31bdb1a9b17705ce0d6986e",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
flake.nix
View file

@ -38,6 +38,7 @@ outputs = {nixpkgs, nixpkgs-unstable, agenix, home-manager, home-manager-unstabl
agenix.packages.x86_64-linux.default agenix.packages.x86_64-linux.default
git git
plasma5Packages.plasma-sdk plasma5Packages.plasma-sdk
nix-diff
]; ];
shellHook ='' shellHook =''
export PS1="$PS1(toast-configs)> " export PS1="$PS1(toast-configs)> "

13
machines/Archie/configuration.nix
View file

@ -33,22 +33,11 @@
# Enable the X11 windowing system. # Enable the X11 windowing system.
services.xserver.enable = true; services.xserver.enable = true;
/*# Enable the pipewire sound server # Enable the pipewire sound server
services.pipewire = { services.pipewire = {
enable = true; enable = true;
pulse.enable = true; pulse.enable = true;
}; /*
/*
Pipewire's audio server seems to be broken for now, so I'm going to
temporarely use pulse as my audio server
*/
services.pipewire = {
audio.enable = false;
pulse.enable = false;
alsa.enable = false;
}; };
hardware.pulseaudio.enable = true;
# Configure keymap in X11 # Configure keymap in X11
# services.xserver.layout = "us"; # services.xserver.layout = "us";

1
roles/desktop/programs/default.nix
View file

@ -6,5 +6,6 @@
./firefox.nix ./firefox.nix
./micro.nix ./micro.nix
./keepassxc.nix ./keepassxc.nix
./jamesdsp.nix
]; ];
} }

5
roles/desktop/programs/jamesdsp.nix Normal file
View file

@ -0,0 +1,5 @@
{ config, pkgs, ... }:
{
users.users.toast.packages = [ pkgs.jamesdsp ];
}

51
roles/desktop/programs/keepassxc.nix
View file

@ -23,36 +23,33 @@ let
in in
{ {
# I'm only using keepass on my user, so I'm installing it with home-manager users.users.toast.packages = [ pkgs.keepassxc ];
home-manager = { home-manager = {
extraSpecialArgs = { kpxcSettings = kpxcSettings; }; extraSpecialArgs = { kpxcSettings = kpxcSettings; };
users.toast = { config, pkgs, kpxcSettings, ... }: { users.toast = { config, pkgs, kpxcSettings, ... }: {
home = { # No module for KeePassXC config :(
packages = [ pkgs.keepassxc ]; home.file = {
# No module for KeePassXC config :( ".config/keepassxc/keepassxc.ini".text = kpxcSettings;
file = { # For some reason the autostart .desktop is not the same as the regular one
".config/keepassxc/keepassxc.ini".text = kpxcSettings; ".config/autostart/org.keepassxc.KeePassXC.desktop".text = ''
# For some reason the autostart .desktop is not the same as the regular one [Desktop Entry]
".config/autostart/org.keepassxc.KeePassXC.desktop".text = '' Name=KeePassXC
[Desktop Entry] GenericName=Password Manager
Name=KeePassXC Exec=keepassxc
GenericName=Password Manager TryExec=keepassxc
Exec=keepassxc Icon=keepassxc
TryExec=keepassxc StartupWMClass=keepassxc
Icon=keepassxc StartupNotify=true
StartupWMClass=keepassxc Terminal=false
StartupNotify=true Type=Application
Terminal=false Version=1.0
Type=Application Categories=Utility;Security;Qt;
Version=1.0 MimeType=application/x-keepass2;
Categories=Utility;Security;Qt; X-GNOME-Autostart-enabled=true
MimeType=application/x-keepass2; X-GNOME-Autostart-Delay=2
X-GNOME-Autostart-enabled=true X-KDE-autostart-after=panel
X-GNOME-Autostart-Delay=2 X-LXQt-Need-Tray=true
X-KDE-autostart-after=panel '';
X-LXQt-Need-Tray=true
'';
};
}; };
}; };
}; };

5
roles/kde/programs/kate.nix
View file

@ -1,8 +1,5 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
home-manager.users.toast = { config, pkgs, ... }: environment.systemPackages = [ pkgs.kate ];
{
home.packages = [ pkgs.kate ];
};
} }