alyraffauf/nixcfg
1
0
Fork 0
mirror of https://github.com/alyraffauf/nixcfg.git synced 2024-11-21 22:13:56 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into add-river
Some checks failed
nix-build / default-build (push) Has been cancelled
Details
nix-build / fallarbor-build (push) Has been cancelled
Details
nix-build / lavaridge-build (push) Has been cancelled
Details
nix-build / mauville-build (push) Has been cancelled
Details
nix-build / petalburg-build (push) Has been cancelled
Details
nix-build / rustboro-build (push) Has been cancelled
Details
nix-build / slateport-build (push) Has been cancelled
Details
nix-check / fmt-check (push) Has been cancelled
Details
nix-check / eval-check (push) Has been cancelled
Details

Browse source
This commit is contained in:
Aly Raffauf 2024-09-25 00:17:23 -04:00 committed by GitHub
parent aa31fac589 f757d87c68
commit 458902af52
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
20 changed files with 56 additions and 167 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
common/wifi.nix
View file

@ -39,22 +39,21 @@
);
in {
"Dustin's A54" = mkWPA2WiFi "Dustin's A54" "$DustinsA54PSK";
"East Pole Coffee Co." = mkWPA2WiFi "East Pole Coffee Co." "$EastPolePSK";
"InmanPerkCustomer" = mkWPA2WiFi "InmanPerkCustomer" "$InmanPerkCustomerPSK";
"javapatron" = mkOpenWiFi "javapatron";
"Muchacho Guest" = mkOpenWiFi "Muchacho Guest";
"PERCguest" = mkWPA2WiFi "PERCguest" "$PERCguestPSK";
"PERC COFFEE 5 Guest" = mkWPA2WiFi "PERC COFFEE 5 Guest" "$PERCguestPSK";
"Parkgrounds1" = mkWPA2WiFi "Parkgrounds1" "$Parkgrounds1PSK";
"PERC COFFEE 5 Guest" = mkWPA2WiFi "PERC COFFEE 5 Guest" "$PERCguestPSK";
"PERCguest" = mkWPA2WiFi "PERCguest" "$PERCguestPSK";
"Stargate-Discovery" = mkWPA2WiFi "Stargate-Discovery" "$StargateDiscoveryPSK";
"Taproom Public WiFi" = mkOpenWiFi "Taproom Public WiFi";
"WeWorkWiFi" = mkEAPWiFi "WeWorkWiFi" "$WeWorkWiFiIdentity" "$WeWorkWiFiPassword" "mschapv2";
"javapatron" = mkOpenWiFi "javapatron";
"VINATL-Guest" = mkWPA2WiFi "VINATL-Guest" "$VINATLGuestPSK";
"wallace" = mkWPA2WiFi "wallace" "$wallacePSK";
"WeWorkWiFi" = mkEAPWiFi "WeWorkWiFi" "$WeWorkWiFiIdentity" "$WeWorkWiFiPassword" "mschapv2";
};
};
wifi = {
backend = "iwd";
powersave = true;
};
wifi.powersave = true;
};
}

4
hosts/slateport/disko.nix → disko/btrfs-subvolumes.nix
View file

@ -1,9 +1,9 @@
{
{disks ? ["/dev/nvme0n1"], ...}: {
disko.devices = {
disk = {
main = {
type = "disk";
device = "/dev/sda";
device = builtins.elemAt disks 0;
content = {
type = "gpt";

4
hosts/lavaridge/disko.nix → disko/luks-btrfs-subvolumes.nix
View file

@ -1,9 +1,9 @@
{
{disks ? ["/dev/nvme0n1"], ...}: {
disko.devices = {
disk = {
vdb = {
type = "disk";
device = "/dev/nvme0n1";
device = builtins.elemAt disks 0;
content = {
type = "gpt";
partitions = {

18
flake.lock
View file

@ -444,11 +444,11 @@
]
},
"locked": {
"lastModified": 1726836401,
"narHash": "sha256-MO/h4RV4Ho4g3W7h6xQkCu5X3wBD1YnziP1Sg/PCCyA=",
"lastModified": 1727183733,
"narHash": "sha256-JyOFDaIHTTpVp1uO/3M4md6KNIXXhcD8ztDlDST0VL8=",
"owner": "alyraffauf",
"repo": "nixhw",
"rev": "bd0c54e428c18213321a16f71ce0782d48c27350",
"rev": "42685325fa3ca92404b73221ffc8fae1e1671154",
"type": "github"
},
"original": {
@ -459,11 +459,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1726447378,
"narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
"lastModified": 1726969270,
"narHash": "sha256-8fnFlXBgM/uSvBlLWjZ0Z0sOdRBesyNdH0+esxqizGc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
"rev": "23cbb250f3bf4f516a2d0bf03c51a30900848075",
"type": "github"
},
"original": {
@ -666,11 +666,11 @@
"wallpapers": {
"flake": false,
"locked": {
"lastModified": 1726468197,
"narHash": "sha256-rag8Dk2qYswdE1GH5ocEF6PhFmnd6amzreZ3ZjLk2iI=",
"lastModified": 1727132619,
"narHash": "sha256-1V9LK/0GwsLjAwedYcW5uXq1y8l4W86Ce2DvrlseLcA=",
"owner": "alyraffauf",
"repo": "wallpapers",
"rev": "fc6bd53fdb9f2c1287e6ce36145a14773bae4dce",
"rev": "b86110d079361e785014fdc22eb3684bccf891c9",
"type": "github"
},
"original": {

3
homeManagerModules/desktop/hyprland/README.md
View file

@ -73,8 +73,9 @@ ______________________________________________________________________
- SUPER + F11: Show/hide top panel.
- SUPER + TAB: Open Window list.
- SUPER + V: Toggle floating window.
- SUPER SHIFT + Backslash: Toggle vertical/horizontal splits.
- SUPER SHIFT + Backslash: Toggle vertical/horizontal splits (dwindle layout only).
- SUPER SHIFT + G: Toggle groupbar.
- SUPER SHIFT + M: Swap window for master (master layout only).
- SUPER SHIFT + W: Toggle fullscreen.
#### Focus

12
homeManagerModules/desktop/hyprland/default.nix
View file

@ -7,6 +7,18 @@
cfg = config.ar.home;
in {
config = lib.mkIf cfg.desktop.hyprland.enable {
services.hyprpaper =
lib.mkIf
(config.stylix.enable && !cfg.services.randomWallpaper.enable)
{
enable = true;
settings = {
preload = ["${config.stylix.image}"];
wallpaper = [",${config.stylix.image}"];
};
};
wayland.windowManager.hyprland = {
enable = true;
settings = import ./settings.nix {inherit config lib pkgs;};

24
homeManagerModules/desktop/hyprland/settings.nix
View file

@ -27,37 +27,38 @@ in {
bind =
[
''$mod,M,exec,${lib.getExe config.programs.rofi.package} -show power-menu -modi "power-menu:${lib.getExe pkgs.rofi-power-menu} --choices=logout/lockscreen/suspend/shutdown/reboot"''
",PRINT,exec,${helpers.screenshot}"
"$mod CTRL,L,exec,${lib.getExe pkgs.swaylock}"
"$mod SHIFT,backslash,togglesplit"
"$mod SHIFT,comma,exec,${lib.getExe pkgs.hyprnome} --previous --move"
"$mod SHIFT,G,togglegroup"
"$mod SHIFT,M,layoutmsg,swapwithmaster master"
"$mod SHIFT,period,exec,${lib.getExe pkgs.hyprnome} --move"
"$mod SHIFT,R,exec,${lib.getExe config.programs.rofi.package} -show run"
"$mod SHIFT,S,movetoworkspace,special:magic"
"$mod SHIFT,V,togglefloating"
"$mod SHIFT,W,fullscreen"
"$mod SHIFT,backslash,togglesplit"
"$mod SHIFT,comma,exec,${lib.getExe pkgs.hyprnome} --previous --move"
"$mod SHIFT,period,exec,${lib.getExe pkgs.hyprnome} --move"
"$mod,B,exec,${lib.getExe cfg.defaultApps.webBrowser}"
"$mod,C,killactive"
"$mod,comma,exec,${lib.getExe pkgs.hyprnome} --previous"
"$mod,E,exec,${lib.getExe cfg.defaultApps.editor}"
"$mod,F,exec,${lib.getExe cfg.defaultApps.fileManager}"
"$mod,F11,exec,pkill -SIGUSR1 waybar"
"$mod,H,changegroupactive,b"
"$mod,L,changegroupactive,f"
"$mod,Left,changegroupactive,b"
"$mod,mouse_down,workspace,+1"
"$mod,mouse_up,workspace,-1"
"$mod,period,exec,${lib.getExe pkgs.hyprnome}"
"$mod,R,exec,${lib.getExe config.programs.rofi.package} -show combi"
"$mod,Right,changegroupactive,f"
"$mod,S,togglespecialworkspace,magic"
"$mod,T,exec,${lib.getExe cfg.defaultApps.terminal}"
"$mod,Tab,exec,${lib.getExe config.programs.rofi.package} -show window"
"$mod,comma,exec,${lib.getExe pkgs.hyprnome} --previous"
"$mod,mouse_down,workspace,+1"
"$mod,mouse_up,workspace,-1"
"$mod,period,exec,${lib.getExe pkgs.hyprnome}"
",PRINT,exec,${helpers.screenshot}"
"CTRL ALT,M,submap,move"
"CTRL ALT,R,submap,resize"
"CTRL,F12,exec,${helpers.screenshot}"
''$mod,M,exec,${lib.getExe config.programs.rofi.package} -show power-menu -modi "power-menu:${lib.getExe pkgs.rofi-power-menu} --choices=logout/lockscreen/suspend/shutdown/reboot"''
]
++ builtins.map (x: "$mod SHIFT,${toString x},movetoworkspace,${toString x}") [1 2 3 4 5 6 7 8 9]
++ builtins.map (x: "$mod,${toString x},workspace,${toString x}") [1 2 3 4 5 6 7 8 9]
@ -168,11 +169,6 @@ in {
};
};
master = {
always_center_master = true;
new_status = false;
};
misc = {
disable_hyprland_logo = true;
disable_splash_rendering = true;

5
homes/aly/gui.nix
View file

@ -45,10 +45,7 @@ self: {pkgs, ...}: {
fileManager = pkgs.xfce.thunar;
};
services = {
gammastep.enable = true;
randomWallpaper.enable = true;
};
services.gammastep.enable = true;
theme = {
enable = true;

1
homes/aly/mail/default.nix
View file

@ -77,6 +77,7 @@ in {
"mailnews.default_sort_order" = 2; # descending, 1 for ascending
"mailnews.default_sort_type" = 18; # sort by date
"mailnews.message_display.disable_remote_image" = false;
"mailnews.start_page.enabled" = false;
"network.cookie.cookieBehavior" = 2; # no cookies
"pdfjs.enabledCache.state" = true;
"privacy.donottrackheader.enabled" = true;

7
hosts/fallarbor/default.nix
View file

@ -11,7 +11,6 @@
./secrets.nix
./stylix.nix
self.inputs.nixhw.nixosModules.framework-13-intel-11th
self.nixosModules.common-auto-upgrade
self.nixosModules.common-base
self.nixosModules.common-locale
self.nixosModules.common-mauville-share
@ -26,11 +25,7 @@
systemd-boot.enable = true;
};
environment.variables = {
FLAKE = "https://flakehub.com/f/alyraffauf/nixcfg/*.tar.gz";
GDK_SCALE = "1.5";
};
environment.variables.GDK_SCALE = "1.5";
networking.hostName = "fallarbor";
system.stateVersion = "24.05";

2
hosts/lavaridge/default.nix
View file

@ -6,10 +6,10 @@
...
}: {
imports = [
./disko.nix
./home.nix
./secrets.nix
./stylix.nix
(import ./../../disko/luks-btrfs-subvolumes.nix {disks = ["/dev/nvme0n1"];})
self.inputs.nixhw.nixosModules.framework-13-amd-7000
self.nixosModules.common-auto-upgrade
self.nixosModules.common-base

3
hosts/mauville/default.nix
View file

@ -114,10 +114,11 @@ in {
greetd = {
enable = true;
autologin = "aly";
session = lib.getExe config.programs.sway.package;
session = lib.getExe config.programs.hyprland.package;
};
steam.enable = true;
hyprland.enable = true;
sway.enable = true;
};

3
hosts/mauville/home.nix
View file

@ -89,11 +89,10 @@
};
wayland.windowManager.hyprland.settings = {
bind = ["$mod SHIFT,M,layoutmsg,swapwithmaster master"];
general.layout = lib.mkForce "master";
master = {
mfact = 0.50;
mfact = 0.40;
orientation = "center";
};
};

2
hosts/mauville/stylix.nix
View file

@ -6,7 +6,7 @@
stylix = {
enable = true;
base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
image = "${self.inputs.wallpapers}/wallhaven-mp886k.jpg";
image = "${self.inputs.wallpapers}/wallhaven-3lyrvy.png";
imageScalingMode = "fill";
polarity = "dark";

2
hosts/petalburg/default.nix
View file

@ -6,10 +6,10 @@
...
}: {
imports = [
./disko.nix
./home.nix
./secrets.nix
./stylix.nix
(import ./../../disko/luks-btrfs-subvolumes.nix {disks = ["/dev/nvme0n1"];})
self.inputs.nixhw.nixosModules.lenovo-yoga-9i-intel-13th
self.nixosModules.common-auto-upgrade
self.nixosModules.common-base

56
hosts/petalburg/disko.nix
View file

@ -1,56 +0,0 @@
{
disko.devices = {
disk = {
vdb = {
type = "disk";
device = "/dev/nvme0n1";
content = {
type = "gpt";
partitions = {
ESP = {
size = "1024M";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [
"defaults"
];
};
};
luks = {
size = "100%";
content = {
type = "luks";
name = "crypted";
content = {
type = "btrfs";
extraArgs = ["-f"];
subvolumes = {
"/root" = {
mountpoint = "/";
mountOptions = ["compress=zstd" "noatime"];
};
"persist" = {
mountpoint = "/persist";
mountOptions = ["compress=zstd" "noatime"];
};
"/home" = {
mountpoint = "/home";
mountOptions = ["compress=zstd" "noatime"];
};
"/nix" = {
mountpoint = "/nix";
mountOptions = ["compress=zstd" "noatime"];
};
};
};
};
};
};
};
};
};
};
}

2
hosts/rustboro/default.nix
View file

@ -6,10 +6,10 @@
...
}: {
imports = [
./disko.nix
./home.nix
./secrets.nix
./stylix.nix
(import ./../../disko/luks-btrfs-subvolumes.nix {disks = ["/dev/sda"];})
self.inputs.nixhw.nixosModules.thinkpad-t440p
self.nixosModules.common-auto-upgrade
self.nixosModules.common-base

56
hosts/rustboro/disko.nix
View file

@ -1,56 +0,0 @@
{
disko.devices = {
disk = {
vdb = {
type = "disk";
device = "/dev/sda";
content = {
type = "gpt";
partitions = {
ESP = {
size = "1024M";
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [
"defaults"
];
};
};
luks = {
size = "100%";
content = {
type = "luks";
name = "crypted";
content = {
type = "btrfs";
extraArgs = ["-f"];
subvolumes = {
"/root" = {
mountpoint = "/";
mountOptions = ["compress=zstd" "noatime"];
};
"persist" = {
mountpoint = "/persist";
mountOptions = ["compress=zstd" "noatime"];
};
"/home" = {
mountpoint = "/home";
mountOptions = ["compress=zstd" "noatime"];
};
"/nix" = {
mountpoint = "/nix";
mountOptions = ["compress=zstd" "noatime"];
};
};
};
};
};
};
};
};
};
};
}

4
hosts/slateport/default.nix
View file

@ -4,13 +4,13 @@
...
}: {
imports = [
./disko.nix
./home.nix
./raffauflabs.nix
./secrets.nix
(import ./../../disko/btrfs-subvolumes.nix {disks = ["/dev/sda"];})
self.inputs.nixhw.nixosModules.common-bluetooth
self.inputs.nixhw.nixosModules.common-intel-cpu
self.inputs.nixhw.nixosModules.common-intel-gpu
self.inputs.nixhw.nixosModules.common-bluetooth
self.inputs.nixhw.nixosModules.common-ssd
self.nixosModules.common-auto-upgrade
self.nixosModules.common-base

BIN
secrets/wifi.age
View file

Binary file not shown.