diff --git a/assets/README.md b/assets/README.md new file mode 100644 index 0000000..3f843ad --- /dev/null +++ b/assets/README.md @@ -0,0 +1,51 @@ +
+

Wallpaper Gallery 🖼️

+
+ +![](https://github.com/Narmis-E/hyprland-dots/blob/main/tokyonight-v2/wallpapers/GLaDOS.jpeg) GLaDOS +|-------| + +![](https://github.com/Narmis-E/hyprland-dots/blob/main/tokyonight-v2/wallpapers/aperture.png) **aperture** +|-------| + +![](https://github.com/Narmis-E/hyprland-dots/blob/main/tokyonight-v2/wallpapers/aperture_labs.png) Aperture Labs (blue) +|-------| + +![](https://github.com/Narmis-E/hyprland-dots/blob/main/tokyonight-v2/wallpapers/aperture_labs_orange.png) Aperture Labs (orange) +|-------| + +![](https://github.com/Narmis-E/hyprland-dots/blob/main/tokyonight-v2/wallpapers/arch.png) Arch Linux +|-------| + +![](https://github.com/Narmis-E/hyprland-dots/blob/main/tokyonight-v2/wallpapers/crosses.png) Crosses +|-------| + +![](https://github.com/Narmis-E/hyprland-dots/blob/main/tokyonight-v2/wallpapers/dp.png) Daft Punk (*veridis quo* -> *very disco* -> *disco very* -> *discovery*???) +|-------| + +![](https://github.com/Narmis-E/hyprland-dots/blob/main/tokyonight-v2/wallpapers/lazygit.png) Lazygit (not bad) +|-------| + +![](https://github.com/Narmis-E/hyprland-dots/blob/main/tokyonight-v2/wallpapers/maze.png) Maze +|-------| + +![](https://github.com/Narmis-E/hyprland-dots/blob/main/tokyonight-v2/wallpapers/rmrf.png) *We making it to grub rescue with this one* 🗣️🗣️🗣️🔥🔥🔥 +|-------| + +![](https://github.com/Narmis-E/hyprland-dots/blob/main/tokyonight-v2/wallpapers/stamina%2B.png) Stamina ++ +|-------| + +![](https://github.com/Narmis-E/hyprland-dots/blob/main/tokyonight-v2/wallpapers/thecakeisalie.png) Always has been +|-------| + +![](https://github.com/Narmis-E/hyprland-dots/blob/main/tokyonight-v2/wallpapers/tn-glados-better.jpg) Genetic Lifeform and Disk Operating System +|-------| + +![](https://github.com/Narmis-E/hyprland-dots/blob/main/tokyonight-v2/wallpapers/tokyonight.png) Tokyonight +|-------| + +![](https://github.com/Narmis-E/hyprland-dots/blob/main/tokyonight-v2/wallpapers/wheatly-better.png) If you can't tell already I *really* like portal +|-------| + +![](https://github.com/Narmis-E/hyprland-dots/blob/main/tokyonight-v2/wallpapers/zigzag.png) Zigzag (from the splatoon 2 loading screen) +|-------| diff --git a/assets/wallpapers/3840x2160-japanese-city-at-night.jpg b/assets/wallpapers/3840x2160-japanese-city-at-night.jpg new file mode 100644 index 0000000..c4e5c2a Binary files /dev/null and b/assets/wallpapers/3840x2160-japanese-city-at-night.jpg differ diff --git a/assets/wallpapers/3840x2160-you-know-im-something-of-a-desktop-background-v0-o3drn5szkfva1.webp b/assets/wallpapers/3840x2160-you-know-im-something-of-a-desktop-background-v0-o3drn5szkfva1.webp new file mode 100644 index 0000000..44124fb Binary files /dev/null and b/assets/wallpapers/3840x2160-you-know-im-something-of-a-desktop-background-v0-o3drn5szkfva1.webp differ diff --git a/assets/wallpapers/4k-Winter-Evening-Snowy-Road-Bus-String-Lights-Sunset-Wallpaper.jpg b/assets/wallpapers/4k-Winter-Evening-Snowy-Road-Bus-String-Lights-Sunset-Wallpaper.jpg new file mode 100644 index 0000000..2820b37 Binary files /dev/null and b/assets/wallpapers/4k-Winter-Evening-Snowy-Road-Bus-String-Lights-Sunset-Wallpaper.jpg differ diff --git a/assets/wallpapers/Augustine-catppuccin-mocha.png b/assets/wallpapers/Augustine-catppuccin-mocha.png new file mode 100644 index 0000000..ea82a45 Binary files /dev/null and b/assets/wallpapers/Augustine-catppuccin-mocha.png differ diff --git a/assets/wallpapers/GLaDOS.jpeg b/assets/wallpapers/GLaDOS.jpeg new file mode 100644 index 0000000..c2aee2c Binary files /dev/null and b/assets/wallpapers/GLaDOS.jpeg differ diff --git a/assets/wallpapers/aperture.png b/assets/wallpapers/aperture.png new file mode 100644 index 0000000..1211016 Binary files /dev/null and b/assets/wallpapers/aperture.png differ diff --git a/assets/wallpapers/aperture_labs.png b/assets/wallpapers/aperture_labs.png new file mode 100644 index 0000000..d7c9b21 Binary files /dev/null and b/assets/wallpapers/aperture_labs.png differ diff --git a/assets/wallpapers/aperture_labs_orange.png b/assets/wallpapers/aperture_labs_orange.png new file mode 100644 index 0000000..fb75a99 Binary files /dev/null and b/assets/wallpapers/aperture_labs_orange.png differ diff --git a/assets/wallpapers/arch.png b/assets/wallpapers/arch.png new file mode 100644 index 0000000..24ac3a6 Binary files /dev/null and b/assets/wallpapers/arch.png differ diff --git a/assets/wallpapers/cats-fishing.png b/assets/wallpapers/cats-fishing.png new file mode 100644 index 0000000..2eccff3 Binary files /dev/null and b/assets/wallpapers/cats-fishing.png differ diff --git a/assets/wallpapers/cityscape.jpg b/assets/wallpapers/cityscape.jpg new file mode 100644 index 0000000..d5790d1 Binary files /dev/null and b/assets/wallpapers/cityscape.jpg differ diff --git a/assets/wallpapers/cityscape2.jpg b/assets/wallpapers/cityscape2.jpg new file mode 100644 index 0000000..959b132 Binary files /dev/null and b/assets/wallpapers/cityscape2.jpg differ diff --git a/assets/wallpapers/colorful-snow.jpg b/assets/wallpapers/colorful-snow.jpg new file mode 100644 index 0000000..66be2db Binary files /dev/null and b/assets/wallpapers/colorful-snow.jpg differ diff --git a/assets/wallpapers/could-someone-please-remove-spiderman-shocking-i-know.jpg b/assets/wallpapers/could-someone-please-remove-spiderman-shocking-i-know.jpg new file mode 100644 index 0000000..b48bb6d Binary files /dev/null and b/assets/wallpapers/could-someone-please-remove-spiderman-shocking-i-know.jpg differ diff --git a/assets/wallpapers/crosses.png b/assets/wallpapers/crosses.png new file mode 100644 index 0000000..8c4e731 Binary files /dev/null and b/assets/wallpapers/crosses.png differ diff --git a/assets/wallpapers/dp.png b/assets/wallpapers/dp.png new file mode 100644 index 0000000..217305e Binary files /dev/null and b/assets/wallpapers/dp.png differ diff --git a/assets/wallpapers/into-the-night.jpg b/assets/wallpapers/into-the-night.jpg new file mode 100644 index 0000000..eeae434 Binary files /dev/null and b/assets/wallpapers/into-the-night.jpg differ diff --git a/assets/wallpapers/lazygit.png b/assets/wallpapers/lazygit.png new file mode 100644 index 0000000..e33ec20 Binary files /dev/null and b/assets/wallpapers/lazygit.png differ diff --git a/assets/wallpapers/lonely-night.jpg b/assets/wallpapers/lonely-night.jpg new file mode 100644 index 0000000..567520f Binary files /dev/null and b/assets/wallpapers/lonely-night.jpg differ diff --git a/assets/wallpapers/maze.png b/assets/wallpapers/maze.png new file mode 100644 index 0000000..91c5377 Binary files /dev/null and b/assets/wallpapers/maze.png differ diff --git a/assets/wallpapers/neonwoman.png b/assets/wallpapers/neonwoman.png new file mode 100644 index 0000000..5f035be Binary files /dev/null and b/assets/wallpapers/neonwoman.png differ diff --git a/assets/wallpapers/old.png b/assets/wallpapers/old.png new file mode 100644 index 0000000..546b753 Binary files /dev/null and b/assets/wallpapers/old.png differ diff --git a/assets/wallpapers/rmrf.png b/assets/wallpapers/rmrf.png new file mode 100644 index 0000000..d60b006 Binary files /dev/null and b/assets/wallpapers/rmrf.png differ diff --git a/assets/wallpapers/samurai.png b/assets/wallpapers/samurai.png new file mode 100644 index 0000000..ce55439 Binary files /dev/null and b/assets/wallpapers/samurai.png differ diff --git a/assets/wallpapers/ship.jpeg b/assets/wallpapers/ship.jpeg new file mode 100644 index 0000000..8d1d057 Binary files /dev/null and b/assets/wallpapers/ship.jpeg differ diff --git a/assets/wallpapers/spike.png b/assets/wallpapers/spike.png new file mode 100644 index 0000000..f5481bb Binary files /dev/null and b/assets/wallpapers/spike.png differ diff --git a/assets/wallpapers/stamina+.png b/assets/wallpapers/stamina+.png new file mode 100644 index 0000000..ccb026c Binary files /dev/null and b/assets/wallpapers/stamina+.png differ diff --git a/assets/wallpapers/thecakeisalie.png b/assets/wallpapers/thecakeisalie.png new file mode 100644 index 0000000..33b6a86 Binary files /dev/null and b/assets/wallpapers/thecakeisalie.png differ diff --git a/assets/wallpapers/tn-glados-better.jpg b/assets/wallpapers/tn-glados-better.jpg new file mode 100644 index 0000000..d6f3d81 Binary files /dev/null and b/assets/wallpapers/tn-glados-better.jpg differ diff --git a/assets/wallpapers/tokyonight.png b/assets/wallpapers/tokyonight.png new file mode 100644 index 0000000..afe04d0 Binary files /dev/null and b/assets/wallpapers/tokyonight.png differ diff --git a/assets/wallpapers/wheatly-better.png b/assets/wallpapers/wheatly-better.png new file mode 100644 index 0000000..7e231c9 Binary files /dev/null and b/assets/wallpapers/wheatly-better.png differ diff --git a/assets/wallpapers/zigzag.png b/assets/wallpapers/zigzag.png new file mode 100644 index 0000000..75da7dc Binary files /dev/null and b/assets/wallpapers/zigzag.png differ diff --git a/flake.lock b/flake.lock index af80eb1..19548d6 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,56 @@ { "nodes": { + "abseil-src": { + "flake": false, + "locked": { + "lastModified": 1722535511, + "narHash": "sha256-51jpDhdZ0n+KLmxh8KVaTz53pZAB0dHjmILFX+OLud4=", + "owner": "abseil", + "repo": "abseil-cpp", + "rev": "4447c7562e3bc702ade25105912dce503f0c4010", + "type": "github" + }, + "original": { + "owner": "abseil", + "ref": "20240722.0", + "repo": "abseil-cpp", + "type": "github" + } + }, + "asio-src": { + "flake": false, + "locked": { + "lastModified": 1702548444, + "narHash": "sha256-8Xo6J6+dTvDtsthjbLMMTInHMDnMMM0rQwzbZu70J/s=", + "owner": "chriskohlhoff", + "repo": "asio", + "rev": "22ccfc94fc77356f7820601f9f33b9129a337d2d", + "type": "github" + }, + "original": { + "owner": "chriskohlhoff", + "ref": "asio-1-30-0", + "repo": "asio", + "type": "github" + } + }, + "curl-src": { + "flake": false, + "locked": { + "lastModified": 1743572790, + "narHash": "sha256-huAGWNm2rYBmgzUuYQ21IYp2skyQECelEkXPMBJY3cE=", + "owner": "curl", + "repo": "curl", + "rev": "1c3149881769e7bd79b072e48374e4c2b3678b2f", + "type": "github" + }, + "original": { + "owner": "curl", + "ref": "curl-8_13_0", + "repo": "curl", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -18,6 +69,23 @@ "type": "github" } }, + "fmt-src": { + "flake": false, + "locked": { + "lastModified": 1758127535, + "narHash": "sha256-AZDmIeU1HbadC+K0TIAGogvVnxt0oE9U6ocpawIgl6g=", + "owner": "fmtlib", + "repo": "fmt", + "rev": "e424e3f2e607da02742f73db84873b8084fc714c", + "type": "github" + }, + "original": { + "owner": "fmtlib", + "ref": "12.0.0", + "repo": "fmt", + "type": "github" + } + }, "hjem": { "inputs": { "nix-darwin": "nix-darwin", @@ -55,6 +123,197 @@ "type": "github" } }, + "incbin-src": { + "flake": false, + "locked": { + "lastModified": 1748303270, + "narHash": "sha256-vgOfViZnWTKpBB6vDNDJSB3YuuGGVhg++zsi9Ubatno=", + "owner": "graphitemaster", + "repo": "incbin", + "rev": "22061f51fe9f2f35f061f85c2b217b55dd75310d", + "type": "github" + }, + "original": { + "owner": "graphitemaster", + "repo": "incbin", + "rev": "22061f51fe9f2f35f061f85c2b217b55dd75310d", + "type": "github" + } + }, + "json-src": { + "flake": false, + "locked": { + "lastModified": 1744360948, + "narHash": "sha256-cECvDOLxgX7Q9R3IE86Hj9JJUxraDQvhoyPDF03B2CY=", + "owner": "nlohmann", + "repo": "json", + "rev": "55f93686c01528224f448c19128836e7df245f72", + "type": "github" + }, + "original": { + "owner": "nlohmann", + "ref": "v3.12.0", + "repo": "json", + "type": "github" + } + }, + "libgit2-src": { + "flake": false, + "locked": { + "lastModified": 1749227175, + "narHash": "sha256-/xI3v7LNhpgfjv/m+sZwYDhhYvS6kQYxiiiG3+EF8Mw=", + "owner": "libgit2", + "repo": "libgit2", + "rev": "0060d9cf5666f015b1067129bd874c6cc4c9c7ac", + "type": "github" + }, + "original": { + "owner": "libgit2", + "ref": "v1.9.1", + "repo": "libgit2", + "type": "github" + } + }, + "luajit-src": { + "flake": false, + "locked": { + "lastModified": 1763177035, + "narHash": "sha256-oYD86MqmlJpiCuEs4LwVtxvarPtz1RPWm8nJqNE0sBs=", + "owner": "SteamClientHomebrew", + "repo": "LuaJIT", + "rev": "89550023569c3e195e75e12951c067fe5591e0d2", + "type": "github" + }, + "original": { + "owner": "SteamClientHomebrew", + "ref": "v2.1", + "repo": "LuaJIT", + "type": "github" + } + }, + "luajson-src": { + "flake": false, + "locked": { + "lastModified": 1763065879, + "narHash": "sha256-5Mdp4jp+rqz2ufkBa1gMfd8nep+Um+mBdr6+Ut6yz9I=", + "owner": "SteamClientHomebrew", + "repo": "LuaJSON", + "rev": "0c1fabf07c42f3907287d1e4f729e0620c1fe6fd", + "type": "github" + }, + "original": { + "owner": "SteamClientHomebrew", + "repo": "LuaJSON", + "rev": "0c1fabf07c42f3907287d1e4f729e0620c1fe6fd", + "type": "github" + } + }, + "millennium": { + "inputs": { + "abseil-src": "abseil-src", + "asio-src": "asio-src", + "curl-src": "curl-src", + "fmt-src": "fmt-src", + "incbin-src": "incbin-src", + "json-src": "json-src", + "libgit2-src": "libgit2-src", + "luajit-src": "luajit-src", + "luajson-src": "luajson-src", + "millennium-src": "millennium-src", + "minhook-src": "minhook-src", + "mini-src": "mini-src", + "minizip-src": "minizip-src", + "nixpkgs": [ + "nixpkgs" + ], + "re2-src": "re2-src", + "websocketpp-src": "websocketpp-src", + "zlib-src": "zlib-src" + }, + "locked": { + "dir": "packages/nix", + "lastModified": 1774491538, + "narHash": "sha256-11rgTocaXAIFYVEcbb6ju/sDN6sZpxjneXj9FSbgwrA=", + "owner": "SteamClientHomebrew", + "repo": "Millennium", + "rev": "bf8b0cd016fcc4168c4e348cbcbfd237de4c01c8", + "type": "github" + }, + "original": { + "dir": "packages/nix", + "owner": "SteamClientHomebrew", + "repo": "Millennium", + "type": "github" + } + }, + "millennium-src": { + "flake": false, + "locked": { + "lastModified": 1770463863, + "narHash": "sha256-MceGTpXobCAh5Ll/1iTWcEf6/nHY3Ll1t06JxbYc+Co=", + "owner": "SteamClientHomebrew", + "repo": "Millennium", + "rev": "1bc62c94a06f25f7e8d7e269f11cd968cf576bff", + "type": "github" + }, + "original": { + "owner": "SteamClientHomebrew", + "repo": "Millennium", + "rev": "1bc62c94a06f25f7e8d7e269f11cd968cf576bff", + "type": "github" + } + }, + "minhook-src": { + "flake": false, + "locked": { + "lastModified": 1743163800, + "narHash": "sha256-0eGFfg365bb4zic1WTHMvKHbxuhhGp72/clu8OklHXs=", + "owner": "TsudaKageyu", + "repo": "minhook", + "rev": "c3fcafdc10146beb5919319d0683e44e3c30d537", + "type": "github" + }, + "original": { + "owner": "TsudaKageyu", + "ref": "v1.3.4", + "repo": "minhook", + "type": "github" + } + }, + "mini-src": { + "flake": false, + "locked": { + "lastModified": 1743356736, + "narHash": "sha256-zBFFOlECbie7+62fTGf+NP4gNmfv2Qddw3ys6xn7o9U=", + "owner": "metayeti", + "repo": "mINI", + "rev": "52b66e987cb56171dc91d96115cdf094b6e4d7a0", + "type": "github" + }, + "original": { + "owner": "metayeti", + "ref": "0.9.18", + "repo": "mINI", + "type": "github" + } + }, + "minizip-src": { + "flake": false, + "locked": { + "lastModified": 1746408966, + "narHash": "sha256-I3CZwtfJMsZYQOMdGhooUN8vssnQj6rCzv8F+rne3vg=", + "owner": "zlib-ng", + "repo": "minizip-ng", + "rev": "f3ed731e27a97e30dffe076ed5e0537daae5c1bd", + "type": "github" + }, + "original": { + "owner": "zlib-ng", + "ref": "4.0.10", + "repo": "minizip-ng", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -123,11 +382,29 @@ "type": "github" } }, + "re2-src": { + "flake": false, + "locked": { + "lastModified": 1762353507, + "narHash": "sha256-0J1HVk+eR7VN0ymucW9dNlT36j16XIfCzcs1EVyEIEU=", + "owner": "google", + "repo": "re2", + "rev": "927f5d53caf8111721e734cf24724686bb745f55", + "type": "github" + }, + "original": { + "owner": "google", + "ref": "2025-11-05", + "repo": "re2", + "type": "github" + } + }, "root": { "inputs": { "flake-parts": "flake-parts", "hjem": "hjem", "import-tree": "import-tree", + "millennium": "millennium", "nixpkgs": "nixpkgs", "wrapper-modules": "wrapper-modules" } @@ -192,6 +469,23 @@ "type": "github" } }, + "websocketpp-src": { + "flake": false, + "locked": { + "lastModified": 1587320717, + "narHash": "sha256-9fIwouthv2GcmBe/UPvV7Xn9P2o0Kmn2hCI4jCh0hPM=", + "owner": "zaphoyd", + "repo": "websocketpp", + "rev": "56123c87598f8b1dd471be83ca841ceae07f95ba", + "type": "github" + }, + "original": { + "owner": "zaphoyd", + "ref": "0.8.2", + "repo": "websocketpp", + "type": "github" + } + }, "wrapper-modules": { "inputs": { "nixpkgs": "nixpkgs_2" @@ -209,6 +503,23 @@ "repo": "nix-wrapper-modules", "type": "github" } + }, + "zlib-src": { + "flake": false, + "locked": { + "lastModified": 1754565515, + "narHash": "sha256-c2RYqHi3hj/ViBzJcYWoNib27GAbq/B1SJUfvG7CPG4=", + "owner": "zlib-ng", + "repo": "zlib-ng", + "rev": "425439062b114a0f6cf625022c41d929c7e879f9", + "type": "github" + }, + "original": { + "owner": "zlib-ng", + "ref": "2.2.5", + "repo": "zlib-ng", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 944d8a1..284b6dc 100644 --- a/flake.nix +++ b/flake.nix @@ -11,6 +11,11 @@ }; wrapper-modules.url = "github:BirdeeHub/nix-wrapper-modules"; + + millennium = { + url = "github:SteamClientHomebrew/Millennium?dir=packages/nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = inputs: inputs.flake-parts.lib.mkFlake {inherit inputs;} (inputs.import-tree ./modules); diff --git a/modules/features/layers/base.nix b/modules/features/layers/base.nix index b518504..7284b91 100644 --- a/modules/features/layers/base.nix +++ b/modules/features/layers/base.nix @@ -1,6 +1,8 @@ { self, inputs, ... }: { flake.nixosModules.base = { pkgs, lib, ... }: { imports = [ inputs.hjem.nixosModules.default ]; + + nixpkgs.overlays = [ inputs.millennium.overlays.default ]; # Set your time zone. time.timeZone = "America/Chicago"; @@ -19,9 +21,6 @@ LC_TIME = "en_US.UTF-8"; }; - services.xserver.displayManager.gdm.enable = true; - services.xserver.desktopManager.gnome.enable = true; - # Enable the X11 windowing system. services.xserver.enable = true; diff --git a/modules/features/layers/development.nix b/modules/features/layers/development.nix index 996e6a8..047c657 100644 --- a/modules/features/layers/development.nix +++ b/modules/features/layers/development.nix @@ -4,6 +4,7 @@ vim git zed-editor + opencode ]; }; } diff --git a/modules/features/layers/gaming.nix b/modules/features/layers/gaming.nix index 1d07500..f05bf1b 100644 --- a/modules/features/layers/gaming.nix +++ b/modules/features/layers/gaming.nix @@ -1,7 +1,10 @@ { self, inputs, ... }: { flake.nixosModules.gaming = { pkgs, lib, ... }: { - programs.steam.enable = true; - programs.steam.gamescopeSession.enable = true; + programs.steam = { + enable = true; + package = pkgs.millennium-steam; + gamescopeSession.enable = true; + }; programs.gamemode.enable = true; environment.systemPackages = with pkgs; [ mangohud diff --git a/modules/features/layers/users/jingus.nix b/modules/features/layers/users/jingus.nix index 2d4dfd2..d768337 100644 --- a/modules/features/layers/users/jingus.nix +++ b/modules/features/layers/users/jingus.nix @@ -1,5 +1,6 @@ { self, inputs, ... }: { flake.nixosModules.user-jingus = { ... }: { niri-users = [ "jingus" ]; + wallpaper-users = [ "jingus" ]; }; } diff --git a/modules/features/layers/wallpapers.nix b/modules/features/layers/wallpapers.nix new file mode 100644 index 0000000..ad02eb7 --- /dev/null +++ b/modules/features/layers/wallpapers.nix @@ -0,0 +1,30 @@ +{ self, inputs, ... }: { + flake.nixosModules.wallpapers = { pkgs, lib, config, ... }: { + + options.wallpaper-users = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = []; + description = "List of users to include wallpapers for"; + }; + + options.wallpaper-destination = lib.mkOption { + type = lib.types.str; + default = "Pictures/Wallpapers"; + description = "Destination path for wallpapers"; + }; + + config = { + hjem = lib.mkIf (config.wallpaper-users != []) { + users = lib.genAttrs config.wallpaper-users (username: { + enable = true; + files = { + "${config.wallpaper-destination}".source = pkgs.runCommand "wallpapers" {} '' + mkdir -p $out + cp -r ${../../../assets/wallpapers}/* $out/ + ''; + }; + }); + }; + }; + }; +} diff --git a/modules/features/niri.nix b/modules/features/niri.nix index 98e7749..c65f8cc 100644 --- a/modules/features/niri.nix +++ b/modules/features/niri.nix @@ -1,6 +1,9 @@ { self, inputs, ... }: { flake.nixosModules.niri = { pkgs, lib, config, ... }: { - imports = [ self.nixosModules.cursors ]; + imports = [ + self.nixosModules.cursors + self.nixosModules.wallpapers + ]; options.niri-users = lib.mkOption { type = lib.types.listOf lib.types.str; @@ -16,9 +19,12 @@ # Enable cursors for niri users cursor-users = lib.mkDefault config.niri-users; + + # Set wallpaper destination explicitly + wallpaper-destination = "Pictures/Wallpapers"; }; }; - + perSystem = { pkgs, lib, self', ... }: { packages.myNiri = inputs.wrapper-modules.wrappers.niri.wrap { inherit pkgs; @@ -33,7 +39,12 @@ }; layout = { - gaps = 10; + gaps = 20; + }; + + cursor = { + xcursor-theme = "Bibata-Modern-Ice"; + xcursor-size = 24; }; binds = { diff --git a/modules/features/noctalia.json b/modules/features/noctalia.json index e61833b..8f49e38 100644 --- a/modules/features/noctalia.json +++ b/modules/features/noctalia.json @@ -2,10 +2,10 @@ "settings": { "settingsVersion": 57, "bar": { - "barType": "floating", + "barType": "simple", "position": "top", "monitors": [], - "density": "compact", + "density": "default", "showOutline": false, "showCapsule": true, "capsuleOpacity": 1, @@ -14,9 +14,9 @@ "contentPadding": 2, "fontScale": 1, "enableExclusionZoneInset": true, - "backgroundOpacity": 0.93, - "useSeparateOpacity": false, - "floating": true, + "backgroundOpacity": 0, + "useSeparateOpacity": true, + "floating": false, "marginVertical": 4, "marginHorizontal": 4, "frameThickness": 8, @@ -252,7 +252,7 @@ "fontFixedScale": 1, "tooltipsEnabled": true, "scrollbarAlwaysVisible": true, - "boxBorderEnabled": false, + "boxBorderEnabled": true, "panelBackgroundOpacity": 0.93, "translucentWidgets": false, "panelsAttachedToBar": true, @@ -261,9 +261,9 @@ }, "location": { "name": "Tokyo", - "weatherEnabled": true, + "weatherEnabled": false, "weatherShowEffects": true, - "useFahrenheit": false, + "useFahrenheit": true, "use12hourFormat": false, "showWeekNumberInCalendar": false, "showCalendarEvents": true, @@ -284,7 +284,7 @@ "id": "calendar-month-card" }, { - "enabled": true, + "enabled": false, "id": "weather-card" } ] @@ -296,13 +296,13 @@ "monitorDirectories": [], "enableMultiMonitorDirectories": false, "showHiddenFiles": false, - "viewMode": "single", + "viewMode": "browse", "setWallpaperOnAllMonitors": true, "fillMode": "crop", "fillColor": "#000000", "useSolidColor": false, "solidColor": "#1a1a2e", - "automationEnabled": false, + "automationEnabled": true, "wallpaperChangeMode": "random", "randomIntervalSec": 300, "transitionDuration": 1500, @@ -690,7 +690,10 @@ "barVisible": true, "openedPanel": "", "lockScreenActive": false, - "wallpapers": {}, + "wallpapers": { + "DP-3": "/home/jingus/Pictures/Wallpapers/ship.jpeg", + "HDMI-A-1": "/home/jingus/Pictures/Wallpapers/ship.jpeg" + }, "desktopWidgetsEditMode": false, "display": { "HDMI-A-1": { diff --git a/modules/hosts/desktop/configuration.nix b/modules/hosts/desktop/configuration.nix index 915404c..de661ce 100644 --- a/modules/hosts/desktop/configuration.nix +++ b/modules/hosts/desktop/configuration.nix @@ -18,6 +18,10 @@ programs.firefox.enable = true; programs.zsh.enable = true; + # Enable Gnome and GDM for login management and some decent default apps + services.displayManager.gdm.enable = true; + services.desktopManager.gnome.enable = true; + # Allow unfree packages nixpkgs.config.allowUnfree = true;