diff --git a/flake.lock b/flake.lock index 9540e96..79a0c50 100644 --- a/flake.lock +++ b/flake.lock @@ -70,6 +70,53 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1779560665, + "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1768127708, + "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1779560665, + "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1779508470, "narHash": "sha256-OtXX32ZNu00Co+iVgV3ffkJVgVVcc0Sy56DdfJm+UQM=", @@ -82,18 +129,75 @@ "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, + "quickshell": { + "inputs": { + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1779430452, + "narHash": "sha256-zTslhsxLqUlRTML506iougTGzyR38Fzhzn7t4KDEuuE=", + "owner": "quickshell-mirror", + "repo": "quickshell", + "rev": "4b4fca3224ab977dc515ac0bb78d00b3dfa71e00", + "type": "github" + }, + "original": { + "owner": "quickshell-mirror", + "repo": "quickshell", + "type": "github" + } + }, "root": { "inputs": { "home-manager": "home-manager", "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", + "skwd-wall": "skwd-wall", "spicetify-nix": "spicetify-nix" } }, + "skwd-daemon": { + "inputs": { + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1779716973, + "narHash": "sha256-LNfLty/M53P8jBf4JW4wwqYT5wYqLG+xNhpGaRrb5MM=", + "owner": "liixini", + "repo": "skwd-daemon", + "rev": "79aa8075fc12cc0bbadf3a08408d15fc777744c4", + "type": "github" + }, + "original": { + "owner": "liixini", + "repo": "skwd-daemon", + "type": "github" + } + }, + "skwd-wall": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "quickshell": "quickshell", + "skwd-daemon": "skwd-daemon" + }, + "locked": { + "lastModified": 1779716953, + "narHash": "sha256-zzCf+o+590KJuySAz/4JbLhy1LZRgJZJI9V9GfqUjIw=", + "owner": "liixini", + "repo": "skwd-wall", + "rev": "ab7424a943e44987d3ec48440711e544b8fe4b58", + "type": "github" + }, + "original": { + "owner": "liixini", + "repo": "skwd-wall", + "type": "github" + } + }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_5", "systems": "systems" }, "locked": { diff --git a/flake.nix b/flake.nix index 5565199..48f7545 100644 --- a/flake.nix +++ b/flake.nix @@ -14,8 +14,9 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; # Day to Day - spicetify-nix.url = "github:Gerg-L/spicetify-nix"; + spicetify-nix.url = "github:Gerg-L/spicetify-nix"; #spotify client nix-flatpak.url = "github:gmodena/nix-flatpak/?ref=latest"; + skwd-wall.url = "github:liixini/skwd-wall"; #wallpaper selector }; outputs = { @@ -23,6 +24,7 @@ nixpkgs, home-manager, nix-flatpak, + skwd-wall, ... } @ inputs: let # Supported systems for your flake packages, shell, etc. @@ -59,9 +61,8 @@ WarNix = nixpkgs.lib.nixosSystem { specialArgs = {inherit inputs;}; modules = [ - # declarative flatpak nix-flatpak.nixosModules.nix-flatpak - # > Our main nixos configuration file < + skwd-wall.nixosModules.default ./nixos/configuration.nix ]; }; diff --git a/home-manager/luke.nix b/home-manager/luke.nix index d0240ff..c78c704 100644 --- a/home-manager/luke.nix +++ b/home-manager/luke.nix @@ -50,6 +50,9 @@ home.packages = with pkgs; [ cargo spotify-player + wl-clipboard + clipse + timg ]; home = { @@ -57,7 +60,6 @@ homeDirectory = "/home/luke"; }; - # necessary? programs.home-manager.enable = true; # Shell environment @@ -122,6 +124,8 @@ enable = true; }; + programs.quickshell.enable = true; + # Day to day programs.spicetify = { enable = true; diff --git a/home-manager/programs/niri/config.kdl b/home-manager/programs/niri/config.kdl index a9d97b2..8467904 100644 --- a/home-manager/programs/niri/config.kdl +++ b/home-manager/programs/niri/config.kdl @@ -279,6 +279,8 @@ spawn-at-startup "waybar" spawn-sh-at-startup "mako --default-timeout=5000" +spawn-at-startup "skwd-daemon" + // To run a shell command (with variables, pipes, etc.), use spawn-sh-at-startup: // spawn-sh-at-startup "qs -c ~/source/qs/MyAwesomeShell" @@ -380,6 +382,8 @@ binds { Mod+T hotkey-overlay-title="Open a Terminal: kitty" { spawn "kitty"; } Mod+D hotkey-overlay-title="Run an Application: fuzzel" { spawn "fuzzel"; } Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; } + //Skwd-wall + Mod+W hotkey-overlay-title="Skwd-wall" { spawn "skwd wall toggle"; } // Use spawn-sh to run a shell command. Do this if you need pipes, multiple commands, etc. // Note: the entire command goes as a single argument. It's passed verbatim to `sh -c`. @@ -470,10 +474,6 @@ binds { // And you can also move a whole workspace to another monitor: // Mod+Shift+Ctrl+Left { move-workspace-to-monitor-left; } // ... -//TODO: -//y -> monitor left -//o -> monitor right -// get rid of Page* Mod+Page_Down { focus-workspace-down; } Mod+Page_Up { focus-workspace-up; } Mod+U { focus-workspace-down; } @@ -565,6 +565,11 @@ binds { // Consume one window from the right to the bottom of the focused column. Mod+Comma { consume-window-into-column; } + // Toggle tabbed column display mode. + // Windows in this column will appear as vertical tabs, + // rather than stacked on top of each other. + Mod+Shift+Comma { toggle-column-tabbed-display; } + // Expel the bottom window from the focused column to the right. Mod+Period { expel-window-from-column; } @@ -604,10 +609,6 @@ binds { Mod+V { toggle-window-floating; } Mod+Shift+V { switch-focus-between-floating-and-tiling; } - // Toggle tabbed column display mode. - // Windows in this column will appear as vertical tabs, - // rather than stacked on top of each other. - Mod+W { toggle-column-tabbed-display; } // Actions to switch layouts. // Note: if you uncomment these, make sure you do NOT have diff --git a/nixos/configuration.nix b/nixos/configuration.nix index b81b762..ebff753 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -91,13 +91,20 @@ AllowHybridSleep=no AllowSuspendThenHibernate=no ''; + + time.timeZone = "America/Los_Angeles"; # display & window managers services.displayManager.sddm.enable = true; services.desktopManager.plasma6.enable = true; programs.niri.enable = true; + programs.skwd-wall.enable = true; programs.gamescope.enable = true; + services.gnome.gnome-keyring.enable = true; + security.pam.services.luke.enableGnomeKeyring = true; + programs.seahorse.enable = true; + environment.systemPackages = with pkgs; [ #java, for minecraft pkgs.jdk17 diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix index 3054bb5..96790ec 100644 --- a/nixos/hardware-configuration.nix +++ b/nixos/hardware-configuration.nix @@ -8,37 +8,29 @@ [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/05ca00ef-287b-46a6-87a3-242c26d4f6dc"; + { device = "/dev/disk/by-uuid/aa5d9502-4814-4db1-a4de-da47d0e0009c"; fsType = "ext4"; }; fileSystems."/boot" = - { device = "/dev/disk/by-uuid/74E9-DC7F"; + { device = "/dev/disk/by-uuid/8B55-BB00"; fsType = "vfat"; options = [ "fmask=0077" "dmask=0077" ]; }; - - #Steam parition to fstab - fileSystems."/mnt/steamstorage" = { + #Steam partition + fileSystems."/mnt/data" = { device = "/dev/disk/by-uuid/4d405cb8-1082-46ef-9248-f10709b85ba9"; fsType = "ext4"; options = [ "nofail" "rw" "user" "exec" ]; }; -#TEMPORARY, TODO: remove - fileSystems."/mnt/main" = { - device = "/dev/disk/by-uuid/7dfa47de-a2e2-4356-adb4-ea61cc9e3e7e"; - fsType = "ext4"; - options = [ "nofail" "ro" ]; - }; - swapDevices = [ ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";