Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
45de738d59 | |||
e6ae0c4c35 | |||
739f2e125f |
@@ -13,9 +13,9 @@ set $term alacritty
|
|||||||
set $menu wofi --term '$term'
|
set $menu wofi --term '$term'
|
||||||
|
|
||||||
### Output configuration
|
### Output configuration
|
||||||
output DP-3 pos 1920 0 res 1920x1080@60Hz
|
output DP-3 pos 3840 0 res 1920x1080@59Hz
|
||||||
output HDMI-A-1 pos 0 0 res 1920x1080@60Hz
|
output HDMI-A-1 pos 0 0 res 1920x1080@59Hz
|
||||||
output DP-2 pos 3840 0 res 1920x1080@60Hz
|
output DP-2 pos 1920 0 res 1920x1080@60Hz
|
||||||
|
|
||||||
### Wallpaper
|
### Wallpaper
|
||||||
output HDMI-A-1 bg ~/.wallpaper/.wallpaper.png fill
|
output HDMI-A-1 bg ~/.wallpaper/.wallpaper.png fill
|
||||||
@@ -25,22 +25,22 @@ output DP-3 bg ~/.wallpaper/.wallpaper.png fill
|
|||||||
### Workspace binding
|
### Workspace binding
|
||||||
|
|
||||||
## DP-3 bindings
|
## DP-3 bindings
|
||||||
workspace 1 output DP-3
|
workspace 1 output DP-2
|
||||||
workspace 2 output DP-3
|
workspace 2 output DP-2
|
||||||
workspace 4 output DP-3
|
workspace 4 output DP-2
|
||||||
workspace 5 output DP-3
|
workspace 5 output DP-2
|
||||||
|
|
||||||
## HDMI-A-1 bindings
|
## HDMI-A-1 bindings
|
||||||
workspace 3 output HDMI-A-1
|
workspace 3 output HDMI-A-1
|
||||||
workspace 9 output HDMI-A-1
|
workspace 9 output HDMI-A-1
|
||||||
|
|
||||||
## DP-2 bindings
|
## DP-2 bindings
|
||||||
workspace 6 output DP-2
|
workspace 6 output DP-3
|
||||||
workspace 7 output DP-2
|
workspace 7 output DP-3
|
||||||
workspace 8 output DP-2
|
workspace 8 output DP-3
|
||||||
|
|
||||||
### Colour options
|
### Colour options
|
||||||
set $bg #24283b
|
set $bg #24283b
|
||||||
set $bg-inactive #323232
|
set $bg-inactive #323232
|
||||||
set $bg-urgent #000000
|
set $bg-urgent #000000
|
||||||
set $text #eeeeec
|
set $text #eeeeec
|
||||||
|
72
flake.lock
generated
72
flake.lock
generated
@@ -7,11 +7,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1759509947,
|
"lastModified": 1749744770,
|
||||||
"narHash": "sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU=",
|
"narHash": "sha256-MEM9XXHgBF/Cyv1RES1t6gqAX7/tvayBC1r/KPyK1ls=",
|
||||||
"owner": "lnl7",
|
"owner": "lnl7",
|
||||||
"repo": "nix-darwin",
|
"repo": "nix-darwin",
|
||||||
"rev": "000eadb231812ad6ea6aebd7526974aaf4e79355",
|
"rev": "536f951efb1ccda9b968e3c9dee39fbeb6d3fdeb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -64,11 +64,11 @@
|
|||||||
"zon2nix": "zon2nix"
|
"zon2nix": "zon2nix"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1760808459,
|
"lastModified": 1753816554,
|
||||||
"narHash": "sha256-+3ups2SbJ2y2CknaoC8P4IphJDWG/yo5loW01BF7STw=",
|
"narHash": "sha256-eyFfBXb5IJaNTGTdkjpWKSMTs8wiJ0i+9n5jUKtVFa4=",
|
||||||
"owner": "ghostty-org",
|
"owner": "ghostty-org",
|
||||||
"repo": "ghostty",
|
"repo": "ghostty",
|
||||||
"rev": "be0da4845cb629bcf1f5f1890a28850bb7adfe16",
|
"rev": "c78d32074ebab14d2060e5cd3c7667cbe37ab8ee",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -84,11 +84,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1758463745,
|
"lastModified": 1753592768,
|
||||||
"narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
|
"narHash": "sha256-oV695RvbAE4+R9pcsT9shmp6zE/+IZe6evHWX63f2Qg=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
|
"rev": "fc3add429f21450359369af74c2375cb34a2d204",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -116,37 +116,24 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 315532800,
|
"lastModified": 1748189127,
|
||||||
"narHash": "sha256-sV6pJNzFkiPc6j9Bi9JuHBnWdVhtKB/mHgVmMPvDFlk=",
|
"narHash": "sha256-zRDR+EbbeObu4V2X5QCd2Bk5eltfDlCr5yvhBwUT6pY=",
|
||||||
"rev": "82c2e0d6dde50b17ae366d2aa36f224dc19af469",
|
"rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre877938.82c2e0d6dde5/nixexprs.tar.xz"
|
"url": "https://releases.nixos.org/nixos/25.05/nixos-25.05.802491.7c43f080a7f2/nixexprs.tar.xz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
|
"url": "https://channels.nixos.org/nixos-25.05/nixexprs.tar.xz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1758360447,
|
"lastModified": 1753749649,
|
||||||
"narHash": "sha256-XDY3A83bclygHDtesRoaRTafUd80Q30D/Daf9KSG6bs=",
|
"narHash": "sha256-+jkEZxs7bfOKfBIk430K+tK9IvXlwzqQQnppC2ZKFj4=",
|
||||||
"rev": "8eaee110344796db060382e15d3af0a9fc396e0e",
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://releases.nixos.org/nixos/unstable/nixos-25.11pre864002.8eaee1103447/nixexprs.tar.xz"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"type": "tarball",
|
|
||||||
"url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs_3": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1760580664,
|
|
||||||
"narHash": "sha256-/YdfibIrnqXAL8p5kqCU345mzpHoOtuVIkMiI2pF4Dc=",
|
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "98ff3f9af2684f6136c24beef08f5e2033fc5389",
|
"rev": "1f08a4df998e21f4e8be8fb6fbf61d11a1a5076a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -162,7 +149,7 @@
|
|||||||
"ghostty": "ghostty",
|
"ghostty": "ghostty",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"nix-flatpak": "nix-flatpak",
|
"nix-flatpak": "nix-flatpak",
|
||||||
"nixpkgs": "nixpkgs_3"
|
"nixpkgs": "nixpkgs_2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems": {
|
"systems": {
|
||||||
@@ -196,11 +183,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1760401936,
|
"lastModified": 1748261582,
|
||||||
"narHash": "sha256-/zj5GYO5PKhBWGzbHbqT+ehY8EghuABdQ2WGfCwZpCQ=",
|
"narHash": "sha256-3i0IL3s18hdDlbsf0/E+5kyPRkZwGPbSFngq5eToiAA=",
|
||||||
"owner": "mitchellh",
|
"owner": "mitchellh",
|
||||||
"repo": "zig-overlay",
|
"repo": "zig-overlay",
|
||||||
"rev": "365085b6652259753b598d43b723858184980bbe",
|
"rev": "aafb1b093fb838f7a02613b719e85ec912914221",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -211,20 +198,27 @@
|
|||||||
},
|
},
|
||||||
"zon2nix": {
|
"zon2nix": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_2"
|
"flake-utils": [
|
||||||
|
"ghostty",
|
||||||
|
"flake-utils"
|
||||||
|
],
|
||||||
|
"nixpkgs": [
|
||||||
|
"ghostty",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1758405547,
|
"lastModified": 1742104771,
|
||||||
"narHash": "sha256-WgaDgvIZMPvlZcZrpPMjkaalTBnGF2lTG+62znXctWM=",
|
"narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=",
|
||||||
"owner": "jcollie",
|
"owner": "jcollie",
|
||||||
"repo": "zon2nix",
|
"repo": "zon2nix",
|
||||||
"rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
|
"rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "jcollie",
|
"owner": "jcollie",
|
||||||
"repo": "zon2nix",
|
"repo": "zon2nix",
|
||||||
"rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245",
|
"rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
15
flake.nix
15
flake.nix
@@ -2,11 +2,16 @@
|
|||||||
description = "Wyatt's nix configuration suite";
|
description = "Wyatt's nix configuration suite";
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
|
||||||
|
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0";
|
nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=v0.6.0";
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/release-25.05";
|
url = "github:nix-community/home-manager/release-25.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
home-manager-unstable = {
|
||||||
|
url = "https://github.com/nix-community/home-manager";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
|
};
|
||||||
darwin = {
|
darwin = {
|
||||||
url = "github:lnl7/nix-darwin/nix-darwin-25.05";
|
url = "github:lnl7/nix-darwin/nix-darwin-25.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
@@ -17,9 +22,11 @@
|
|||||||
outputs = inputs @ {
|
outputs = inputs @ {
|
||||||
self,
|
self,
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
|
nixpkgs-unstable,
|
||||||
nix-flatpak,
|
nix-flatpak,
|
||||||
darwin,
|
darwin,
|
||||||
home-manager,
|
home-manager,
|
||||||
|
home-manager-unstable,
|
||||||
ghostty,
|
ghostty,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
@@ -28,6 +35,10 @@
|
|||||||
extraSpecialArgs = {
|
extraSpecialArgs = {
|
||||||
inherit userName userEmail ghostty;
|
inherit userName userEmail ghostty;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
obsidianOverlay = final: prev: {
|
||||||
|
obsidian = nixpkgs-unstable.legacyPackages.${final.system}.obsidian;
|
||||||
|
};
|
||||||
in {
|
in {
|
||||||
meta = import ./meta;
|
meta = import ./meta;
|
||||||
|
|
||||||
@@ -66,6 +77,10 @@
|
|||||||
./modules/common
|
./modules/common
|
||||||
./modules/machine/cloud
|
./modules/machine/cloud
|
||||||
|
|
||||||
|
{
|
||||||
|
nixpkgs.overlays = [ obsidianOverlay ];
|
||||||
|
}
|
||||||
|
|
||||||
home-manager.nixosModules.home-manager
|
home-manager.nixosModules.home-manager
|
||||||
{
|
{
|
||||||
home-manager.useGlobalPkgs = true;
|
home-manager.useGlobalPkgs = true;
|
||||||
|
@@ -1,4 +1,5 @@
|
|||||||
{
|
{
|
||||||
|
config,
|
||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
userName,
|
userName,
|
||||||
@@ -13,7 +14,7 @@
|
|||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
# Import sub modules
|
# Import sub modules
|
||||||
imports = map (module: import module {inherit lib pkgs dirs userName userEmail ghostty;}) [
|
imports = map (module: import module {inherit config lib pkgs dirs userName userEmail ghostty;}) [
|
||||||
./atuin.nix
|
./atuin.nix
|
||||||
./shell.nix
|
./shell.nix
|
||||||
./packages
|
./packages
|
||||||
@@ -27,6 +28,7 @@ in {
|
|||||||
./browser.nix
|
./browser.nix
|
||||||
./zellij.nix
|
./zellij.nix
|
||||||
./bat.nix
|
./bat.nix
|
||||||
|
./obsidian.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
# Home Manager needs a bit of information about you and the
|
# Home Manager needs a bit of information about you and the
|
||||||
@@ -56,7 +58,7 @@ in {
|
|||||||
size = 22;
|
size = 22;
|
||||||
};
|
};
|
||||||
|
|
||||||
stateVersion = "24.11";
|
stateVersion = "25.05";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Let Home Manager install and manage itself.
|
# Let Home Manager install and manage itself.
|
||||||
|
@@ -15,7 +15,7 @@
|
|||||||
extraConfig = {
|
extraConfig = {
|
||||||
init.defaultBranch = "master";
|
init.defaultBranch = "master";
|
||||||
push.autoSetupRemote = true;
|
push.autoSetupRemote = true;
|
||||||
pull.rebase = false;
|
pull.merge = true;
|
||||||
merge.tool = "nvimdiff";
|
merge.tool = "nvimdiff";
|
||||||
mergetool.keepBackup = false;
|
mergetool.keepBackup = false;
|
||||||
};
|
};
|
||||||
|
53
home/obsidian.nix
Normal file
53
home/obsidian.nix
Normal file
@@ -0,0 +1,53 @@
|
|||||||
|
{ config, home-manager-unstable, pkgs, ...}: {
|
||||||
|
home.packages = with pkgs; [
|
||||||
|
obsidian
|
||||||
|
obsidian-export
|
||||||
|
];
|
||||||
|
programs.obsidian = {
|
||||||
|
enable = true;
|
||||||
|
package =
|
||||||
|
vaults = {
|
||||||
|
"notes" = {
|
||||||
|
enable = true;
|
||||||
|
target = "${config.home.homeDirectory}/Documents/obsidian/notes";
|
||||||
|
};
|
||||||
|
"work-notes" = {
|
||||||
|
enable = true;
|
||||||
|
target = "${config.home.homeDirectory}/Documents/obsidian/work-notes";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
# defaultSettings = {
|
||||||
|
# themes = [ "catppuccin" ];
|
||||||
|
# };
|
||||||
|
};
|
||||||
|
|
||||||
|
home.activation.obsidianRepos = config.lib.dag.entryAfter ["writeBoundary"] ''
|
||||||
|
REPOS_DIR="${config.home.homeDirectory}/Documents/obsidian"
|
||||||
|
|
||||||
|
# Create the repos directory if it doesn't exist
|
||||||
|
mkdir -p "$REPOS_DIR"
|
||||||
|
|
||||||
|
# Function to clone or update a repository
|
||||||
|
clone_or_update() {
|
||||||
|
local repo_url="$1"
|
||||||
|
local vault_name="$2"
|
||||||
|
local vault_path="$REPOS_DIR/$vault_name"
|
||||||
|
|
||||||
|
if [ -d "$vault_path/.git" ]; then
|
||||||
|
echo "Updating existing vault: $vault_name"
|
||||||
|
cd "$vault_path"
|
||||||
|
${pkgs.git}/bin/git pull origin main || ${pkgs.git}/bin/git pull origin master || true
|
||||||
|
else
|
||||||
|
echo "Cloning new vault: $vault_name"
|
||||||
|
rm -rf "$vault_path" # Remove if exists but not a git repo
|
||||||
|
${pkgs.git}/bin/git clone "$repo_url" "$vault_path" || true
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
# Clone repositories
|
||||||
|
clone_or_update "https://scm.wyattjmiller.com/NoteFolio/notes.git" "notes"
|
||||||
|
clone_or_update "https://scm.wyattjmiller.com/NoteFolio/work-notes.git" "work-notes"
|
||||||
|
|
||||||
|
echo "Obsidian repository vaults setup complete in $REPOS_DIR"
|
||||||
|
'';
|
||||||
|
}
|
@@ -23,7 +23,6 @@
|
|||||||
fh
|
fh
|
||||||
aria2
|
aria2
|
||||||
yt-dlp
|
yt-dlp
|
||||||
obsidian
|
|
||||||
vscode
|
vscode
|
||||||
weechat
|
weechat
|
||||||
inetutils
|
inetutils
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
{pkgs, lib, ...}: {
|
{pkgs, ...}: {
|
||||||
programs.fish = {
|
programs.fish = {
|
||||||
enable = true;
|
enable = true;
|
||||||
# initExtra = ''
|
# initExtra = ''
|
||||||
@@ -52,27 +52,6 @@
|
|||||||
'';
|
'';
|
||||||
onEvent = "fish_greeting";
|
onEvent = "fish_greeting";
|
||||||
};
|
};
|
||||||
} // lib.optionalAttrs pkgs.stdenv.isLinux {
|
|
||||||
block = {
|
|
||||||
body = ''
|
|
||||||
systemd-inhibit --what=sleep --who="$USER" --why="manual invocation" --mode=block sleep infinity &
|
|
||||||
set -g INHIBIT_PID $last_pid
|
|
||||||
echo "Sleep inhibited. PID: $INHIBIT_PID"
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
unblock = {
|
|
||||||
body = ''
|
|
||||||
if set -q INHIBIT_PID
|
|
||||||
kill $INHIBIT_PID 2>/dev/null
|
|
||||||
and echo "Sleep inhibitor removed. PID: $INHIBIT_PID"
|
|
||||||
or echo "Failed to kill process or already terminated."
|
|
||||||
set -e INHIBIT_PID
|
|
||||||
else
|
|
||||||
echo "No active sleep inhibitor found."
|
|
||||||
end
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -147,5 +147,20 @@ in {
|
|||||||
programs.waybar = {
|
programs.waybar = {
|
||||||
enable = pkgs.stdenv.isLinux;
|
enable = pkgs.stdenv.isLinux;
|
||||||
systemd.enable = true;
|
systemd.enable = true;
|
||||||
|
|
||||||
|
package = pkgs.waybar.overrideAttrs (old: {
|
||||||
|
version = "0.13.0";
|
||||||
|
|
||||||
|
src = pkgs.fetchFromGitHub {
|
||||||
|
owner = "Alexays";
|
||||||
|
repo = "Waybar";
|
||||||
|
rev = "0fcda9afa519eb84deda68c051f7938a6c6bdbce";
|
||||||
|
sha256 = "sha256-Puo/Y4qotb6uEEe9vbu/hyFXwLntr48R2C6mrmDKs0c=";
|
||||||
|
fetchSubmodules = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
buildInputs = old.buildInputs ++ [ pkgs.fftw ];
|
||||||
|
mesonFlags = (old.mesonFlags or []) ++ [ "-Dcava=disabled" ];
|
||||||
|
});
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
@@ -1,19 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
cfg = config.appimage;
|
|
||||||
in {
|
|
||||||
options.appimage = {
|
|
||||||
enable = mkEnableOption "AppImage support";
|
|
||||||
};
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
appimageupdate
|
|
||||||
appimage-run
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
@@ -1,23 +1,20 @@
|
|||||||
{ lib, pkgs, ... }: {
|
{ lib, pkgs, ... }: {
|
||||||
|
# Common packages that every system will use
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
git
|
git
|
||||||
vim
|
vim
|
||||||
neovim
|
neovim
|
||||||
usbutils
|
usbutils
|
||||||
coreutils
|
coreutils
|
||||||
|
lshw
|
||||||
|
systemd
|
||||||
|
dmidecode
|
||||||
pciutils
|
pciutils
|
||||||
|
nix-ld
|
||||||
patchelf
|
patchelf
|
||||||
htop
|
htop
|
||||||
] ++
|
];
|
||||||
lib.optionals pkgs.stdenv.isLinux (with pkgs; [
|
|
||||||
systemd
|
|
||||||
lshw
|
|
||||||
dmidecode
|
|
||||||
nix-ld
|
|
||||||
]) ++
|
|
||||||
lib.optionals pkgs.stdenv.isDarwin (with pkgs; [
|
|
||||||
# nothing here, yet ;)
|
|
||||||
]);
|
|
||||||
|
|
||||||
|
# Common environment variables that every system will use
|
||||||
environment.variables.EDITOR = "nvim";
|
environment.variables.EDITOR = "nvim";
|
||||||
}
|
}
|
||||||
|
@@ -1,23 +1,30 @@
|
|||||||
{ lib, pkgs, userName, hostname, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
|
lib,
|
||||||
|
pkgs,
|
||||||
|
userName,
|
||||||
|
hostname,
|
||||||
|
...
|
||||||
|
} @ args: {
|
||||||
networking.hostName = hostname;
|
networking.hostName = hostname;
|
||||||
|
|
||||||
users.users."${userName}" = {
|
# Don't forget to set a password with ‘passwd’!
|
||||||
home = if pkgs.stdenv.isDarwin
|
users.users."${userName}" = lib.mkMerge [
|
||||||
then "/Users/${userName}"
|
{
|
||||||
else "/home/${userName}";
|
home =
|
||||||
description = userName;
|
if pkgs.stdenv.isDarwin
|
||||||
} // lib.optionalAttrs pkgs.stdenv.isLinux {
|
then "/Users/${userName}"
|
||||||
group = "${userName}";
|
else "/home/${userName}";
|
||||||
isNormalUser = true;
|
description = userName;
|
||||||
};
|
}
|
||||||
|
|
||||||
users.groups.wyatt = {};
|
(lib.mkIf (pkgs.stdenv.isLinux) {
|
||||||
nix.settings.trusted-users = [userName];
|
group = "${userName}";
|
||||||
|
isNormalUser = true;
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
security = lib.optionalAttrs pkgs.stdenv.isLinux {
|
security.sudo = {
|
||||||
sudo.extraRules = [
|
extraRules = [
|
||||||
{
|
{
|
||||||
groups = [ "wheel" ];
|
groups = [ "wheel" ];
|
||||||
commands = [
|
commands = [
|
||||||
@@ -30,9 +37,7 @@
|
|||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
environment = lib.optionalAttrs pkgs.stdenv.isDarwin {
|
users.groups.wyatt = {};
|
||||||
etc."sudoers.d/wheel-nopasswd".text = ''
|
|
||||||
%wheel ALL=(ALL:ALL) NOPASSWD: SETENV: ALL
|
nix.settings.trusted-users = [userName];
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
@@ -11,23 +11,20 @@
|
|||||||
"info.beyondallreason.bar"
|
"info.beyondallreason.bar"
|
||||||
"io.dbeaver.DBeaverCommunity"
|
"io.dbeaver.DBeaverCommunity"
|
||||||
"io.openrct2.OpenRCT2"
|
"io.openrct2.OpenRCT2"
|
||||||
"md.obsidian.Obsidian"
|
|
||||||
"org.prismlauncher.PrismLauncher"
|
"org.prismlauncher.PrismLauncher"
|
||||||
"sh.cider.Cider"
|
"sh.cider.Cider"
|
||||||
];
|
];
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
(import ../../apps/flatpak.nix {
|
(import ../../apps/flatpak.nix {
|
||||||
inherit lib pkgs flatpakPackages userName;
|
inherit lib pkgs flatpakPackages;
|
||||||
})
|
})
|
||||||
../../apps/gaming.nix
|
../../apps/gaming.nix
|
||||||
../../apps/appimage.nix
|
|
||||||
../../graphics
|
../../graphics
|
||||||
../../pwrMgmt
|
../../pwrMgmt
|
||||||
../../networking/core.nix
|
../../networking/core.nix
|
||||||
../../sound/pipewire.nix
|
../../sound/pipewire.nix
|
||||||
../../sound/shairport.nix
|
../../sound/shairport.nix
|
||||||
../../sound/focusrite.nix
|
|
||||||
../../virtualization/podman.nix
|
../../virtualization/podman.nix
|
||||||
../../virtualization/hardware.nix
|
../../virtualization/hardware.nix
|
||||||
];
|
];
|
||||||
@@ -36,13 +33,9 @@ in {
|
|||||||
nix.settings.experimental-features = ["nix-command" "flakes"];
|
nix.settings.experimental-features = ["nix-command" "flakes"];
|
||||||
|
|
||||||
# Custom kernel/boot stuff
|
# Custom kernel/boot stuff
|
||||||
boot = {
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
kernelPackages = pkgs.linuxPackages_latest;
|
boot.loader.systemd-boot.enable = true;
|
||||||
loader = {
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
systemd-boot.enable = true;
|
|
||||||
efi.canTouchEfiVariables = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Enable Bluetooth if present
|
# Enable Bluetooth if present
|
||||||
hardware.bluetooth.enable = true;
|
hardware.bluetooth.enable = true;
|
||||||
@@ -69,6 +62,21 @@ in {
|
|||||||
wl-clip-persist
|
wl-clip-persist
|
||||||
];
|
];
|
||||||
|
|
||||||
|
# Enable OpenSSH
|
||||||
|
services.openssh.enable = true;
|
||||||
|
|
||||||
|
# Enable keyring
|
||||||
|
services.gnome.gnome-keyring.enable = true;
|
||||||
|
|
||||||
|
# Enable GnuPG
|
||||||
|
programs.gnupg.agent = {
|
||||||
|
enable = true;
|
||||||
|
enableSSHSupport = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# Enable SUID wrappers (some programs need them)
|
||||||
|
programs.mtr.enable = true;
|
||||||
|
|
||||||
# Enable Polkit
|
# Enable Polkit
|
||||||
security.polkit.enable = true;
|
security.polkit.enable = true;
|
||||||
|
|
||||||
@@ -136,39 +144,14 @@ in {
|
|||||||
networkManager.enable = true;
|
networkManager.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
programs = {
|
# Enable dconf
|
||||||
# Enable GnuPG
|
programs.dconf.enable = true;
|
||||||
gnupg.agent = {
|
|
||||||
enable = true;
|
|
||||||
enableSSHSupport = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Enable SUID wrappers (some programs need them)
|
|
||||||
mtr.enable = true;
|
|
||||||
|
|
||||||
# Enable dconf
|
|
||||||
dconf.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Add username to groups "wheel" and "video" - more may be added here later
|
# Add username to groups "wheel" and "video" - more may be added here later
|
||||||
users.users.${userName}.extraGroups = ["wheel" "video" "gamemode" "podman" "network"];
|
users.users.${userName}.extraGroups = ["wheel" "video" "gamemode" "podman" "network"];
|
||||||
|
|
||||||
services = {
|
# Flatpak packages (see ../../apps/flatpak.nix)
|
||||||
# Enable OpenSSH
|
services.flatpak.packages = flatpakPackages;
|
||||||
openssh.enable = true;
|
|
||||||
|
|
||||||
# Enable keyring
|
|
||||||
gnome.gnome-keyring.enable = true;
|
|
||||||
|
|
||||||
# Flatpak packages (see ../../apps/flatpak.nix)
|
|
||||||
flatpak.packages = flatpakPackages;
|
|
||||||
};
|
|
||||||
|
|
||||||
# Focusrite Scarlett audio interface support (see ../../sound/focusrite.nix)
|
|
||||||
sound.hardware.focusrite.enable = true;
|
|
||||||
|
|
||||||
# AppImage support
|
|
||||||
appimage.enable = true;
|
|
||||||
|
|
||||||
# XDG stuff
|
# XDG stuff
|
||||||
xdg = {
|
xdg = {
|
||||||
@@ -176,12 +159,12 @@ in {
|
|||||||
enable = true;
|
enable = true;
|
||||||
config = {
|
config = {
|
||||||
sway = {
|
sway = {
|
||||||
default = ["wlr" "gtk"];
|
default = [ "wlr" "gtk" ];
|
||||||
"org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
|
"org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
|
||||||
};
|
};
|
||||||
common = {
|
common = {
|
||||||
default = ["gtk"];
|
default = [ "gtk" ];
|
||||||
"org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
|
"org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
extraPortals = with pkgs; [
|
extraPortals = with pkgs; [
|
||||||
|
@@ -12,24 +12,24 @@
|
|||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
];
|
];
|
||||||
|
|
||||||
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "thunderbolt" "ahci" "usb_storage" "usbhid" "sd_mod"];
|
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
|
||||||
boot.initrd.kernelModules = [];
|
boot.initrd.kernelModules = [];
|
||||||
boot.kernelModules = ["kvm-amd"];
|
boot.kernelModules = ["kvm-amd"];
|
||||||
boot.extraModulePackages = [];
|
boot.extraModulePackages = [];
|
||||||
|
|
||||||
fileSystems."/" = {
|
fileSystems."/" = {
|
||||||
device = "/dev/disk/by-uuid/f8f39aae-61d2-437d-a8e1-01066bbb3c5c";
|
device = "/dev/disk/by-label/COMPUTER";
|
||||||
fsType = "xfs";
|
fsType = "xfs";
|
||||||
};
|
};
|
||||||
|
|
||||||
fileSystems."/boot" = {
|
fileSystems."/boot" = {
|
||||||
device = "/dev/disk/by-uuid/B72F-087F";
|
device = "/dev/disk/by-label/BOOT";
|
||||||
fsType = "vfat";
|
fsType = "vfat";
|
||||||
options = ["fmask=0022" "dmask=0022"];
|
options = ["fmask=0022" "dmask=0022"];
|
||||||
};
|
};
|
||||||
|
|
||||||
swapDevices = [
|
swapDevices = [
|
||||||
{device = "/dev/disk/by-uuid/6d6bcc02-20a9-4ae8-9c1e-5124fb2b2634";}
|
{device = "/dev/disk/by-label/SWAP";}
|
||||||
];
|
];
|
||||||
|
|
||||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||||
|
@@ -5,7 +5,7 @@
|
|||||||
}:
|
}:
|
||||||
with lib; {
|
with lib; {
|
||||||
options = {
|
options = {
|
||||||
security.sudoers = {
|
security.sudo = {
|
||||||
needsPassword = mkOption {
|
needsPassword = mkOption {
|
||||||
type = types.bool;
|
type = types.bool;
|
||||||
default = true;
|
default = true;
|
||||||
|
@@ -1,33 +0,0 @@
|
|||||||
# Must be paired with the pipewire Nix module, this does nothing but install packages
|
|
||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}:
|
|
||||||
with lib; let
|
|
||||||
cfg = config.sound.hardware.focusrite;
|
|
||||||
in {
|
|
||||||
options.sound.hardware.focusrite = {
|
|
||||||
enable = mkEnableOption "Focusrite audio interface support";
|
|
||||||
guiSupport = mkOption {
|
|
||||||
type = types.bool;
|
|
||||||
default = false;
|
|
||||||
description = "Enable GUI support for Focusrite Scarlett audio interface (installs alsa-scarlett-gui)";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
config = mkIf cfg.enable (mkMerge [
|
|
||||||
{
|
|
||||||
environment.systemPackages = with pkgs;
|
|
||||||
[
|
|
||||||
scarlett2
|
|
||||||
alsa-scarlett-gui
|
|
||||||
]
|
|
||||||
++ (
|
|
||||||
if cfg.guiSupport
|
|
||||||
then [pkgs.alsa-scarlett-gui]
|
|
||||||
else []
|
|
||||||
);
|
|
||||||
}
|
|
||||||
]);
|
|
||||||
}
|
|
@@ -1,16 +1,7 @@
|
|||||||
{ lib, pkgs, userName, ...}: {
|
{pkgs, ...}: {
|
||||||
services.shairport-sync = {
|
services.shairport-sync = {
|
||||||
enable = pkgs.stdenv.isLinux;
|
enable = pkgs.stdenv.isLinux;
|
||||||
openFirewall = pkgs.stdenv.isLinux;
|
openFirewall = pkgs.stdenv.isLinux;
|
||||||
# arguments = "-v -o pa";
|
arguments = "-v -o pw";
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services.shairport-sync = {
|
|
||||||
serviceConfig = {
|
|
||||||
User = lib.mkForce "${userName}";
|
|
||||||
};
|
|
||||||
environment = {
|
|
||||||
XDG_RUNTIME_DIR = "/run/user/1000";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user