Compare commits

...

3 Commits

Author SHA1 Message Date
d9ec914402 update 2025-11-10 21:08:41 +00:00
d218fc2b06 alsdkjf 2025-11-10 20:22:40 +00:00
42c6f9aa68 Stuff 2025-11-10 20:20:57 +00:00
6 changed files with 81 additions and 54 deletions

87
flake.lock generated
View File

@@ -10,11 +10,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1760836749, "lastModified": 1762618334,
"narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=", "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "2f0f812f69f3eb4140157fe15e12739adf82e32a", "rev": "fcdea223397448d35d9b31f798479227e80183f6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -29,7 +29,8 @@
"devenv" "devenv"
], ],
"flake-compat": [ "flake-compat": [
"devenv" "devenv",
"flake-compat"
], ],
"git-hooks": [ "git-hooks": [
"devenv", "devenv",
@@ -41,11 +42,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752264895, "lastModified": 1760971495,
"narHash": "sha256-1zBPE/PNAkPNUsOWFET4J0cjlvziH8DOekesDmjND+w=", "narHash": "sha256-IwnNtbNVrlZIHh7h4Wz6VP0Furxg9Hh0ycighvL5cZc=",
"owner": "cachix", "owner": "cachix",
"repo": "cachix", "repo": "cachix",
"rev": "47053aef762f452e816e44eb9a23fbc3827b241a", "rev": "c5bfd933d1033672f51a863c47303fc0e093c2d2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -63,11 +64,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761420116, "lastModified": 1762095388,
"narHash": "sha256-k8v/AvYeJmiKMjDd4xw6oG8idyXYYxKEsObB+Dkv6N4=", "narHash": "sha256-7Q8LtcvKWHbP8znARRTOY2tpU5WoV6FHwp5TZJOI8Us=",
"owner": "9001", "owner": "9001",
"repo": "copyparty", "repo": "copyparty",
"rev": "4fcd2c41932d731b052bf1be6879b4310f4d3e10", "rev": "ac085b8149ff50e03d260128596dd130ed1c7cae",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -110,11 +111,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761427990, "lastModified": 1762791812,
"narHash": "sha256-MnrJFwdkwt0FHvRj6vbVfCBWoAPW9O9+HOldMM1yeR8=", "narHash": "sha256-O7Ne62r8hKE3FPqUsukMblxyYCFTh2jV5gHgIsI3rnE=",
"owner": "cachix", "owner": "cachix",
"repo": "devenv", "repo": "devenv",
"rev": "7419c04fc798d5d5918413d4cb6c8629f9d4e8a3", "rev": "1faab0d28c573f2a8dba2cf457b9d383adba252a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -126,11 +127,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1747046372, "lastModified": 1761588595,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -163,11 +164,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1756770412, "lastModified": 1760948891,
"narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "4524271976b625a4a605beefd893f270620fd751", "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -255,11 +256,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758108966, "lastModified": 1760663237,
"narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=", "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b", "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -339,11 +340,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761468550, "lastModified": 1762787259,
"narHash": "sha256-nY4vyN1QdHhC5Gj3545fI2Y7FSr/gs8ID4gPmF8HPww=", "narHash": "sha256-t2U/GLLXHa2+kJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1830716059bfee7cbcfbfcc38d7be98e482a5762", "rev": "37a3d97f2873e0f68711117c34d04b7c7ead8f4e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -361,11 +362,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752603129, "lastModified": 1762351818,
"narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", "narHash": "sha256-0ptUDbYwxv1kk/uzEX4+NJjY2e16MaAhtzAOJ6K0TG0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", "rev": "b959c67241cae17fc9e4ee7eaf13dfa8512477ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -422,16 +423,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1758763079, "lastModified": 1761648602,
"narHash": "sha256-Bx1A+lShhOWwMuy3uDzZQvYiBKBFcKwy6G6NEohhv6A=", "narHash": "sha256-H97KSB/luq/aGobKRuHahOvT1r7C03BgB6D5HBZsbN8=",
"owner": "cachix", "owner": "cachix",
"repo": "nix", "repo": "nix",
"rev": "6f0140527c2b0346df4afad7497baa08decb929f", "rev": "3e5644da6830ef65f0a2f7ec22830c46285bfff6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "cachix", "owner": "cachix",
"ref": "devenv-2.30.5", "ref": "devenv-2.30.6",
"repo": "nix", "repo": "nix",
"type": "github" "type": "github"
} }
@@ -444,11 +445,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752054764, "lastModified": 1762090880,
"narHash": "sha256-Ob/HuUhANoDs+nvYqyTKrkcPXf4ZgXoqMTQoCK0RFgQ=", "narHash": "sha256-fbRQzIGPkjZa83MowjbD2ALaJf9y6KMDdJBQMKFeY/8=",
"owner": "guibou", "owner": "guibou",
"repo": "nixGL", "repo": "nixGL",
"rev": "a8e1ce7d49a149ed70df676785b07f63288f53c5", "rev": "b6105297e6f0cd041670c3e8628394d4ee247ed5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -459,11 +460,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1761373498, "lastModified": 1762596750,
"narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -587,11 +588,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761471016, "lastModified": 1762748864,
"narHash": "sha256-sCiTEdvR5bnsAKmm0BcR6DLN4YKSUa43xLopA0VHYww=", "narHash": "sha256-YgQ80R6TW9GxS0Ozaqe9mTVewuOWqwRmMUhRUpKsoCs=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "9876658e1abf52bafa06bec7b0c2ba7e03931b0e", "rev": "02bb5919dab81a3fea4d8d4663ea67922a463cd3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -607,11 +608,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1760747435, "lastModified": 1762735003,
"narHash": "sha256-wNB/W3x+or4mdNxFPNOH5/WFckNpKgFRZk7OnOsLtm0=", "narHash": "sha256-F5mQBMc1fNZnyVzBWTB6RsSglWwpTTBekHxzPeGegD4=",
"owner": "mitchellh", "owner": "mitchellh",
"repo": "zig-overlay", "repo": "zig-overlay",
"rev": "d0f239b887b1ac736c0f3dde91bf5bf2ecf3a420", "rev": "b4dc0184e0cff5094d4a746a5cd34ef30f6fdc12",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -10,7 +10,7 @@
hardware.graphics.enable32Bit = true; hardware.graphics.enable32Bit = true;
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
services.pulseaudio.enable = false; services.pulseaudio.enable = false;
services.blueman.enable = true; services.blueman.enable = lib.mkDefault true;
programs.partition-manager.enable = true; programs.partition-manager.enable = true;
networking = { networking = {
@@ -43,19 +43,30 @@
fraunces fraunces
noto-fonts noto-fonts
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-emoji noto-fonts-color-emoji
nerd-fonts.iosevka nerd-fonts.iosevka
monocraft monocraft
source-code-pro source-code-pro
ubuntu_font_family ubuntu-classic
]; ];
fontDir.enable = true; fontDir.enable = true;
}; };
specialisation = {
niri.configuration = {
programs.niri.enable = true;
};
plasma.configuration = {
boot.loader.systemd-boot.sortKey = "default";
services.blueman.enable = false;
services.desktopManager.plasma6.enable = true;
};
};
programs = { programs = {
sway.enable = true; sway.enable = true;
niri.enable = true; # niri.enable = true;
steam = { steam = {
enable = true; enable = true;
@@ -80,6 +91,10 @@
theme = "maldives"; theme = "maldives";
}; };
# desktopManager.plasma6 = {
# enable = true;
# };
pipewire = { pipewire = {
enable = true; enable = true;
pulse.enable = true; pulse.enable = true;

View File

@@ -11,5 +11,5 @@
./waybar ./waybar
]; ];
zen-browser.enable = true; programs.zen-browser.enable = true;
} }

View File

@@ -38,8 +38,8 @@ input {
mouse { mouse {
// off // off
// natural-scroll // natural-scroll
// accel-speed 0.2 accel-speed 0.2
// accel-profile "flat" accel-profile "flat"
// scroll-method "no-scroll" // scroll-method "no-scroll"
} }
@@ -98,6 +98,17 @@ output "eDP-1" {
// position x=1280 y=0 // position x=1280 y=0
} }
output "DP-3" {
scale 1.33
position x=0 y=600
}
output "HDMI-A-1" {
scale 1.33
transform "90"
position x=2880 y=0
}
// Settings that influence how windows are positioned and sized. // Settings that influence how windows are positioned and sized.
// Find more information on the wiki: // Find more information on the wiki:
// https://github.com/YaLTeR/niri/wiki/Configuration:-Layout // https://github.com/YaLTeR/niri/wiki/Configuration:-Layout

View File

@@ -8,7 +8,7 @@ cursor-style = block
shell-integration-features = no-cursor shell-integration-features = no-cursor
window-theme = ghostty window-theme = ghostty
window-decoration = false window-decoration = auto
working-directory = home working-directory = home
unfocused-split-opacity = 1 unfocused-split-opacity = 1

View File

@@ -158,9 +158,9 @@ in {
git = { git = {
enable = true; enable = true;
package = pkgs.gitFull; package = pkgs.gitFull;
userName = "Daniel Patterson"; settings = {
userEmail = "me@danielpatterson.dev"; user.name = "Daniel Patterson";
extraConfig = { user.email = "me@danielpatterson.dev";
pull.rebase = true; pull.rebase = true;
init.defaultBranch = "main"; init.defaultBranch = "main";
format.signOff = "yes"; format.signOff = "yes";