From 54bd19fbc04f24db3cc19e186db23d89fa33c7e2 Mon Sep 17 00:00:00 2001 From: Cookiez Date: Tue, 9 Dec 2025 12:40:16 +0100 Subject: [PATCH] - Removed Hyprland. - Changed to use unstable branch. - Removed Noctalia. - Enhanced Stylix configuration. Now targets nothing by default. --- flake.lock | 131 +++++++-------- flake.nix | 22 +-- hyprland/autostart.nix | 21 --- hyprland/home.nix | 22 --- hyprland/hyprland.conf | 310 ----------------------------------- hyprland/hyprland.nix | 64 -------- modules/configuration.nix | 55 ++++--- modules/default.nix | 15 -- modules/firefox-home.nix | 9 + modules/firefox.nix | 4 + modules/noctalia/default.nix | 14 -- modules/noctalia/home.nix | 13 -- modules/packages.nix | 3 +- modules/portainer.nix | 32 ---- modules/stylix/default.nix | 8 +- modules/stylix/home.nix | 6 +- niri/niri.nix | 1 - other/aliases | 26 --- plasma/plasma.nix | 3 + 19 files changed, 116 insertions(+), 643 deletions(-) delete mode 100644 hyprland/autostart.nix delete mode 100644 hyprland/home.nix delete mode 100644 hyprland/hyprland.conf delete mode 100644 hyprland/hyprland.nix create mode 100644 modules/firefox-home.nix delete mode 100644 modules/noctalia/default.nix delete mode 100644 modules/noctalia/home.nix delete mode 100644 modules/portainer.nix diff --git a/flake.lock b/flake.lock index 6783813..1c1a60b 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1752979451, - "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", + "lastModified": 1760703920, + "narHash": "sha256-m82fGUYns4uHd+ZTdoLX2vlHikzwzdu2s2rYM2bNwzw=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", + "rev": "d646af9b7d14bff08824538164af99d0c521b185", "type": "github" }, "original": { @@ -71,11 +71,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1758112371, - "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", + "lastModified": 1764724327, + "narHash": "sha256-OkFLrD3pFR952TrjQi1+Vdj604KLcMnkpa7lkW7XskI=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", + "rev": "66b7c635763d8e6eb86bd766de5a1e1fbfcc1047", "type": "github" }, "original": { @@ -92,11 +92,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -125,11 +125,11 @@ "flake": false, "locked": { "host": "gitlab.gnome.org", - "lastModified": 1762869044, - "narHash": "sha256-nwm/GJ2Syigf7VccLAZ66mFC8mZJFqpJmIxSGKl7+Ds=", + "lastModified": 1764524476, + "narHash": "sha256-bTmNn3Q4tMQ0J/P0O5BfTQwqEnCiQIzOGef9/aqAZvk=", "owner": "GNOME", "repo": "gnome-shell", - "rev": "680e3d195a92203f28d4bf8c6e8bb537cc3ed4ad", + "rev": "c0e1ad9f0f703fd0519033b8f46c3267aab51a22", "type": "gitlab" }, "original": { @@ -165,16 +165,16 @@ ] }, "locked": { - "lastModified": 1764736872, - "narHash": "sha256-4mqLegNQeD54X7enm6EI9aNWl6CaIfyhl5PaYoGYwqk=", + "lastModified": 1765217760, + "narHash": "sha256-BVVyAodLcAD8KOtR3yCStBHSE0WAH/xQWH9f0qsxbmk=", "owner": "nix-community", "repo": "home-manager", - "rev": "3366918730bb6b699395a9d237397f1d710a94b3", + "rev": "e5b1f87841810fc24772bf4389f9793702000c9b", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "master", "repo": "home-manager", "type": "github" } @@ -212,11 +212,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1764721873, - "narHash": "sha256-EHMH54iI7MYYb7mUBE6JUtbbVhHTF7jtkuZ0Lo1bkBg=", + "lastModified": 1765258158, + "narHash": "sha256-d35lpzPLgL8gVruRAFt/KPwXQh7a19wR1AzQJHjyyuo=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "f3935696628433007c582fc323730ba18f137a1d", + "rev": "7546342de11138550fcadf104b5257f6534886e2", "type": "github" }, "original": { @@ -245,11 +245,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1764678181, - "narHash": "sha256-TMs2Px19UAG06zITXAH7efl7X8G7BDyMCy1ilX/8wy0=", + "lastModified": 1765256153, + "narHash": "sha256-tHey91LxQM6pgnTfguw0jqN45xj8X/0Vu71RPGkGSKg=", "owner": "YaLTeR", "repo": "niri", - "rev": "f874b2fce50e0f7ba21e270c86cfa168a1506b82", + "rev": "83a733e08512d9a6ff5332ef53acc0e8e635c2ea", "type": "github" }, "original": { @@ -290,11 +290,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764774872, - "narHash": "sha256-vDfYOigiikglo99pdzJtt41rrkxFz8Vin/s0fgv4QOk=", + "lastModified": 1765271087, + "narHash": "sha256-u38f0e122QdMNWcgUVEzjDklxOauP/k0bEYNMg+Eeac=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "28944de8e5fee5343ddc75de812ced58871abe0c", + "rev": "adf3274db725a05e8c2722e1ca62c781cea33cd0", "type": "github" }, "original": { @@ -306,56 +306,36 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1764560356, - "narHash": "sha256-M5aFEFPppI4UhdOxwdmceJ9bDJC4T6C6CzCK1E2FZyo=", + "lastModified": 1764983851, + "narHash": "sha256-y7RPKl/jJ/KAP/VKLMghMgXTlvNIJMHKskl8/Uuar7o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6c8f0cca84510cc79e09ea99a299c9bc17d03cb6", + "rev": "d9bc5c7dceb30d8d6fafa10aeb6aa8a48c218454", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1764522689, - "narHash": "sha256-SqUuBFjhl/kpDiVaKLQBoD8TLD+/cTUzzgVFoaHrkqY=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8bb5646e0bed5dbd3ab08c7a7cc15b75ab4e1d0f", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "noctalia": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1764776148, - "narHash": "sha256-4d4wrlYeN+HUQ+ixvHWQMguG4TxbPWyiyffca2V+zFc=", - "owner": "noctalia-dev", - "repo": "noctalia-shell", - "rev": "7e46f225465457aed8b89d6557619a0cb2602c2c", - "type": "github" - }, - "original": { - "owner": "noctalia-dev", - "repo": "noctalia-shell", - "type": "github" - } - }, "nur": { "inputs": { "flake-parts": [ @@ -368,11 +348,11 @@ ] }, "locked": { - "lastModified": 1758998580, - "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", + "lastModified": 1764773531, + "narHash": "sha256-mCBl7MD1WZ7yCG6bR9MmpPO2VydpNkWFgnslJRIT1YU=", "owner": "nix-community", "repo": "NUR", - "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", + "rev": "1d9616689e98beded059ad0384b9951e967a17fa", "type": "github" }, "original": { @@ -432,7 +412,6 @@ "nix-flatpak": "nix-flatpak", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_2", - "noctalia": "noctalia", "plasma-manager": "plasma-manager", "quickshell": "quickshell", "stylix": "stylix", @@ -460,16 +439,16 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1764765253, - "narHash": "sha256-wHGRoMy5L373ezz8QpW9v9Cc3BTgUL9tJh4LUDCLcmE=", + "lastModified": 1765047449, + "narHash": "sha256-VQcqjJ2g0kT9TW4ENwA2HBQJzfbCUd5s1Wm3K+R2QZY=", "owner": "nix-community", "repo": "stylix", - "rev": "228616717d4502f334d40d18441e79d686fcc349", + "rev": "bd00e01aab676aee88e6cc5c9238b4a5a7d6639a", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.11", + "ref": "master", "repo": "stylix", "type": "github" } @@ -525,11 +504,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1757716333, - "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", + "lastModified": 1763914658, + "narHash": "sha256-Hju0WtMf3iForxtOwXqGp3Ynipo0EYx1AqMKLPp9BJw=", "owner": "tinted-theming", "repo": "schemes", - "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", + "rev": "0f6be815d258e435c9b137befe5ef4ff24bea32c", "type": "github" }, "original": { @@ -541,11 +520,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1757811970, - "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", + "lastModified": 1764465359, + "narHash": "sha256-lbSVPqLEk2SqMrnpvWuKYGCaAlfWFMA6MVmcOFJjdjE=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", + "rev": "edf89a780e239263cc691a987721f786ddc4f6aa", "type": "github" }, "original": { @@ -557,11 +536,11 @@ "tinted-zed": { "flake": false, "locked": { - "lastModified": 1757811247, - "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", + "lastModified": 1764464512, + "narHash": "sha256-rCD/pAhkMdCx6blsFwxIyvBJbPZZ1oL2sVFrH07lmqg=", "owner": "tinted-theming", "repo": "base16-zed", - "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", + "rev": "907dbba5fb8cf69ebfd90b00813418a412d0a29a", "type": "github" }, "original": { @@ -590,11 +569,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1764721075, - "narHash": "sha256-ChH4nq0cMEEkzkHqKlQt5Z7wxrk8ybcEHuA1YKAYmV0=", + "lastModified": 1765201946, + "narHash": "sha256-7zkEUqmeWToaTGp29YI7HUN7qiSCauNB2ep0TpB1Jwk=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "1b918e29b419e89910014054e8b71d54c9235ea5", + "rev": "2f9981ad0890739980d09cd2a18293a1d47d0f01", "type": "github" }, "original": { @@ -611,11 +590,11 @@ ] }, "locked": { - "lastModified": 1764736168, - "narHash": "sha256-CQcj/oWKH4zN8Xkc1RglX+uOJTW1fwNWvMQWRXRlEys=", + "lastModified": 1765175766, + "narHash": "sha256-M4zs4bVUv0UNuVGspwwlcGs5FpCDt52LQBA5a9nj5Lg=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "df63ce4f706567e6efa083ba63d5e7792bf70ffa", + "rev": "5126a8426773dc213a8c0f0d646aca116194dab6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 91cf443..51659d4 100644 --- a/flake.nix +++ b/flake.nix @@ -2,11 +2,11 @@ description = "NixOS configuration"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware"; #To Provide Framework13 hardware modules - home-manager.url = "github:nix-community/home-manager/release-25.11"; + home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; plasma-manager = { @@ -19,7 +19,7 @@ zen-browser.inputs.nixpkgs.follows = "nixpkgs"; #stylix.url = "github:nix-community/stylix/"; - stylix.url = "github:nix-community/stylix/release-25.11"; #Had to use branch or it would not build corrently + stylix.url = "github:nix-community/stylix/master"; #Had to use branch or it would not build corrently stylix.inputs.nixpkgs.follows = "nixpkgs"; quickshell = { @@ -32,12 +32,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - noctalia = { - url = "github:noctalia-dev/noctalia-shell"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.quickshell.follows = "quickshell"; - }; - nix-flatpak.url = "github:gmodena/nix-flatpak"; grub2-themes.url = "github:vinceliuice/grub2-themes"; @@ -47,13 +41,10 @@ let username = "cookiez"; hostname = "nixos"; - version = "25.11"; + version = "26.05"; #DO NOT change to "unstable" as it is not a valid option for all cascading uses of this variable system = "x86_64-linux"; pkgs = import nixpkgs { inherit system; }; - hyprlandEnabled = false; - plasmaEnabled = false; - framework13 = true; in { @@ -69,12 +60,7 @@ }; modules = [ ./modules - #grub2-themes.nixosModules.default - #nix-flatpak.nixosModules.nix-flatpak - #stylix.nixosModules.stylix #Conditional Modules! - ] ++ (if hyprlandEnabled then [ ./hyprland/hyprland.nix ] else [ ]) ++ [ - ] ++ (if plasmaEnabled then [ ./plasma/plasma.nix ] else [ ]) ++ [ ] ++ (if framework13 then [ nixos-hardware.nixosModules.framework-13-7040-amd ] else [ ]) ++ [ ]; }; diff --git a/hyprland/autostart.nix b/hyprland/autostart.nix deleted file mode 100644 index 7d8ff94..0000000 --- a/hyprland/autostart.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ config, pkgs, ... }: -{ -#to show logs of services run: journalctl --user-unit={service-name} --user - - systemd.user.services.autostart-noctalia = { - enable = false; - description = "automatically start noctalia shell"; - - after = [ "graphical-session.target" ]; - wantedBy = [ "graphical-session.target" ]; - partOf = [ "graphical-session.target" ]; - - serviceConfig = { - ExecStart = [ "qs -c noctalia-shell" ]; - - Restart = "on-failure"; - RestartSec = "1s"; - }; - }; - -} diff --git a/hyprland/home.nix b/hyprland/home.nix deleted file mode 100644 index 39b020f..0000000 --- a/hyprland/home.nix +++ /dev/null @@ -1,22 +0,0 @@ -{pkgs, inputs, ...}: -{ - - imports = [ - ]; - - wayland.windowManager.hyprland = { - enable = true; - xwayland.enable = true; - - settings = { -# bind = [ -# "SUPER, Space, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window" -# ]; - #So hyprland doesnt break after a rebuild... - #exec = [ "systemctl --user restart hyprland-session.target" ]; - }; - - extraConfig = builtins.readFile ./hyprland.conf; - - }; -} diff --git a/hyprland/hyprland.conf b/hyprland/hyprland.conf deleted file mode 100644 index b5fb43a..0000000 --- a/hyprland/hyprland.conf +++ /dev/null @@ -1,310 +0,0 @@ -# This is an example Hyprland config file. -# Refer to the wiki for more information. -# https://wiki.hyprland.org/Configuring/ - -# Please note not all available settings / options are set here. -# For a full list, see the wiki - -# You can split this configuration into multiple files -# Create your files separately and then link them to this file like this: -# source = ~/.config/hypr/myColors.conf - - -################ -### MONITORS ### -################ - -# See https://wiki.hyprland.org/Configuring/Monitors/ -monitor=,preferred,auto,auto - - -################### -### MY PROGRAMS ### -################### - -# See https://wiki.hyprland.org/Configuring/Keywords/ - -# Set programs that you use -$terminal = kitty -$fileManager = dolphin -$menu = wofi --show drun - - -################# -### AUTOSTART ### -################# - -# Autostart necessary processes (like notifications daemons, status bars, etc.) -# Or execute your favorite apps at launch like this: - -#USE autostart.nix INSTEAD OF THIS!!! - -#exec = [ "systemctl --user restart hyprland-session.target" ]; -# exec-once = $terminal -# exec-once = nm-applet & -# exec-once = waybar & hyprpaper & firefox -# exec-once = qs -c noctalia-shell - -############################# -### ENVIRONMENT VARIABLES ### -############################# - -# See https://wiki.hyprland.org/Configuring/Environment-variables/ - -env = XCURSOR_SIZE,24 -env = HYPRCURSOR_SIZE,24 - - -################### -### PERMISSIONS ### -################### - -# See https://wiki.hyprland.org/Configuring/Permissions/ -# Please note permission changes here require a Hyprland restart and are not applied on-the-fly -# for security reasons - -# ecosystem { -# enforce_permissions = 1 -# } - -# permission = /usr/(bin|local/bin)/grim, screencopy, allow -# permission = /usr/(lib|libexec|lib64)/xdg-desktop-portal-hyprland, screencopy, allow -# permission = /usr/(bin|local/bin)/hyprpm, plugin, allow - -# -##################### -### LOOK AND FEEL ### -##################### - -# Refer to https://wiki.hyprland.org/Configuring/Variables/ - -# https://wiki.hyprland.org/Configuring/Variables/#general -general { - gaps_in = 5 - gaps_out = 20 - - border_size = 2 - - # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors - col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg - col.inactive_border = rgba(595959aa) - - # Set to true enable resizing windows by clicking and dragging on borders and gaps - resize_on_border = false - - # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on - allow_tearing = false - - layout = dwindle -} - -# https://wiki.hyprland.org/Configuring/Variables/#decoration -decoration { - rounding = 10 - rounding_power = 2 - - # Change transparency of focused and unfocused windows - active_opacity = 1.0 - inactive_opacity = 1.0 - - shadow { - enabled = true - range = 4 - render_power = 3 - color = rgba(1a1a1aee) - } - - # https://wiki.hyprland.org/Configuring/Variables/#blur - blur { - enabled = true - size = 3 - passes = 1 - - vibrancy = 0.1696 - } -} - -# https://wiki.hyprland.org/Configuring/Variables/#animations -animations { - enabled = yes, please :) - - # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more - - bezier = easeOutQuint,0.23,1,0.32,1 - bezier = easeInOutCubic,0.65,0.05,0.36,1 - bezier = linear,0,0,1,1 - bezier = almostLinear,0.5,0.5,0.75,1.0 - bezier = quick,0.15,0,0.1,1 - - animation = global, 1, 10, default - animation = border, 1, 5.39, easeOutQuint - animation = windows, 1, 4.79, easeOutQuint - animation = windowsIn, 1, 4.1, easeOutQuint, popin 87% - animation = windowsOut, 1, 1.49, linear, popin 87% - animation = fadeIn, 1, 1.73, almostLinear - animation = fadeOut, 1, 1.46, almostLinear - animation = fade, 1, 3.03, quick - animation = layers, 1, 3.81, easeOutQuint - animation = layersIn, 1, 4, easeOutQuint, fade - animation = layersOut, 1, 1.5, linear, fade - animation = fadeLayersIn, 1, 1.79, almostLinear - animation = fadeLayersOut, 1, 1.39, almostLinear - animation = workspaces, 1, 1.94, almostLinear, fade - animation = workspacesIn, 1, 1.21, almostLinear, fade - animation = workspacesOut, 1, 1.94, almostLinear, fade -} - -# Ref https://wiki.hyprland.org/Configuring/Workspace-Rules/ -# "Smart gaps" / "No gaps when only" -# uncomment all if you wish to use that. -# workspace = w[tv1], gapsout:0, gapsin:0 -# workspace = f[1], gapsout:0, gapsin:0 -# windowrule = bordersize 0, floating:0, onworkspace:w[tv1] -# windowrule = rounding 0, floating:0, onworkspace:w[tv1] -# windowrule = bordersize 0, floating:0, onworkspace:f[1] -# windowrule = rounding 0, floating:0, onworkspace:f[1] - -# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more -dwindle { - pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below - preserve_split = true # You probably want this -} - -# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more -master { - new_status = master -} - -# https://wiki.hyprland.org/Configuring/Variables/#misc -misc { - force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers - disable_hyprland_logo = true # If true disables the random hyprland logo / anime girl background. :( -} - - -############# -### INPUT ### -############# - -# https://wiki.hyprland.org/Configuring/Variables/#input -input { - kb_layout = de - kb_variant = - kb_model = - kb_options = - kb_rules = - - follow_mouse = 1 - - sensitivity = 0 # -1.0 - 1.0, 0 means no modification. - - touchpad { - natural_scroll = false - } -} - -# https://wiki.hyprland.org/Configuring/Variables/#gestures -gestures { - workspace_swipe = false -} - -# Example per-device config -# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more -device { - name = epic-mouse-v1 - sensitivity = -0.5 -} - - -################### -### KEYBINDINGS ### -################### - -# See https://wiki.hyprland.org/Configuring/Keywords/ -$mainMod = SUPER # Sets "Windows" key as main modifier - -#Custom Ones -bind = $mainMod, Space, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window - -# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more -bind = $mainMod, Enter, exec, $terminal -bind = $mainMod, C, killactive, -bind = $mainMod, L, exec, hyprlock -#bind = $mainMod, M, exit, -#bind = $mainMod, E, exec, $fileManager -#bind = $mainMod, V, togglefloating, -#bind = $mainMod, R, exec, $menu -#bind = $mainMod, P, pseudo, # dwindle -#bind = $mainMod, J, togglesplit, # dwindle - -# Move focus with mainMod + arrow keys -bind = $mainMod, left, movefocus, l -bind = $mainMod, right, movefocus, r -bind = $mainMod, up, movefocus, u -bind = $mainMod, down, movefocus, d - -# Switch workspaces with mainMod + [0-9] -bind = $mainMod, 1, workspace, 1 -bind = $mainMod, 2, workspace, 2 -bind = $mainMod, 3, workspace, 3 -bind = $mainMod, 4, workspace, 4 -bind = $mainMod, 5, workspace, 5 -bind = $mainMod, 6, workspace, 6 -bind = $mainMod, 7, workspace, 7 -bind = $mainMod, 8, workspace, 8 -bind = $mainMod, 9, workspace, 9 -bind = $mainMod, 0, workspace, 10 - -# Move active window to a workspace with mainMod + SHIFT + [0-9] -bind = $mainMod SHIFT, 1, movetoworkspace, 1 -bind = $mainMod SHIFT, 2, movetoworkspace, 2 -bind = $mainMod SHIFT, 3, movetoworkspace, 3 -bind = $mainMod SHIFT, 4, movetoworkspace, 4 -bind = $mainMod SHIFT, 5, movetoworkspace, 5 -bind = $mainMod SHIFT, 6, movetoworkspace, 6 -bind = $mainMod SHIFT, 7, movetoworkspace, 7 -bind = $mainMod SHIFT, 8, movetoworkspace, 8 -bind = $mainMod SHIFT, 9, movetoworkspace, 9 -bind = $mainMod SHIFT, 0, movetoworkspace, 10 - -# Example special workspace (scratchpad) -#bind = $mainMod, S, togglespecialworkspace, magic -#bind = $mainMod SHIFT, S, movetoworkspace, special:magic - -# Scroll through existing workspaces with mainMod + scroll -bind = $mainMod, mouse_down, workspace, e+1 -bind = $mainMod, mouse_up, workspace, e-1 - -# Move/resize windows with mainMod + LMB/RMB and dragging -bindm = $mainMod, mouse:272, movewindow -bindm = $mainMod, mouse:273, resizewindow - -# Laptop multimedia keys for volume and LCD brightness -bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+ -bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- -bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle -bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle -bindel = ,XF86MonBrightnessUp, exec, brightnessctl -e4 -n2 set 5%+ -bindel = ,XF86MonBrightnessDown, exec, brightnessctl -e4 -n2 set 5%- - -# Requires playerctl -bindl = , XF86AudioNext, exec, playerctl next -bindl = , XF86AudioPause, exec, playerctl play-pause -bindl = , XF86AudioPlay, exec, playerctl play-pause -bindl = , XF86AudioPrev, exec, playerctl previous - -############################## -### WINDOWS AND WORKSPACES ### -############################## - -# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more -# See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules - -# Example windowrule -# windowrule = float,class:^(kitty)$,title:^(kitty)$ - -# Ignore maximize requests from apps. You'll probably like this. -windowrule = suppressevent maximize, class:.* - -# Fix some dragging issues with XWayland -windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0 diff --git a/hyprland/hyprland.nix b/hyprland/hyprland.nix deleted file mode 100644 index c32344f..0000000 --- a/hyprland/hyprland.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ config, inputs, pkgs, ... }: -{ - imports = [ - ./autostart.nix - ../modules/noctalia - ../modules/hyprlock - ../modules/hyprpaper - ]; - - home-manager.sharedModules = [ - ./home.nix - ]; - - environment.systemPackages = with pkgs; - [ - (waybar.overrideAttrs (oldAttrs: { - mesonFlags = oldAttrs.mesonFlags ++ [ "-Dexperimental=true" ]; - }) - ) - hyprland - dunst - libnotify - hyprpaper - sway #Sway Wayland compositor - #kitty #Terminal (Already Included by default) - rofi #Search bar (Meta + Space) - yazi - hyprlock - ]; - - programs = { - hyprland = { - enable = true; - xwayland.enable = true; - withUWSM = false; - }; - - hyprlock = { - enable = true; - }; - - #waybar.enable = true; - #rofi.enable = true; - }; - - - #services.xserver.enable = true; - #services.xserver.displayManager.sddm.enable = true; - - xdg.portal = { - enable = true; - extraPortals = [ pkgs.xdg-desktop-portal-gtk ]; - }; - - #sound.enable = true; - #security.rtkit.enable = true; - #services.pipewire = { - # enable = true; - # alsa.enable = true; - # #alsa.support3Bbit = true; - # pulse.enable = true; - # jack.enable = true; - #}; -} diff --git a/modules/configuration.nix b/modules/configuration.nix index 1a8581f..0e4570b 100644 --- a/modules/configuration.nix +++ b/modules/configuration.nix @@ -35,33 +35,38 @@ ]; # Bootloader. - boot.loader = { - systemd-boot.enable = false; - efi.canTouchEfiVariables = true; - #boot.loader.efi.efiSysMountPoint = "/boot/efi"; + boot = { + kernelParams = [ "quiet" "splash" ]; + initrd.verbose = false; + loader = { + systemd-boot.enable = false; + efi.canTouchEfiVariables = true; + #boot.loader.efi.efiSysMountPoint = "/boot/efi"; - grub = { - enable = true; - device = "/dev/nvme0n1"; #Needs to be changed when using a new computer! (Make grub partition - look below!) - #devices = [ "nodev" ]; - efiSupport = true; - useOSProber = true; - #splashImage = -# extraConfig = '' -# menuentry "NixOS - Default" { -# set hidden=1 -# } -# ''; + grub = { + enable = true; + device = "/dev/nvme0n1"; #Needs to be changed when using a new computer! (Make grub partition - look below!) + #devices = [ "nodev" ]; + efiSupport = true; + useOSProber = true; + configurationLimit = 5; + #splashImage = + # extraConfig = '' + # menuentry "NixOS - Default" { + # set hidden=1 + # } + # ''; + }; + + + grub2-theme = { + enable = true; + theme = "whitesur"; + footer = true; + }; + + timeout = 10; }; - - - grub2-theme = { - enable = true; - theme = "whitesur"; - footer = true; - }; - - timeout = 10; }; #Ensure there is a grub_bios partition: (gparted) diff --git a/modules/default.nix b/modules/default.nix index 61825b0..13d3045 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -10,7 +10,6 @@ #./hardware-configuration.nix ../plasma/plasma.nix - ../hyprland/hyprland.nix ../niri/niri.nix ]; @@ -23,24 +22,10 @@ ./configuration.nix ]; - programs.gamemode.enable = true; - environment.etc."nixos-tags".text = "plasma"; }; }; - "hyprland" = { - inheritParentConfig = false; - configuration = { - imports = [ - ../hyprland/hyprland.nix - ./configuration.nix - ]; - - environment.etc."nixos-tags".text = "hyprland"; - }; - }; - # "minimal" = { # inheritParentConfig = false; # configuration = { diff --git a/modules/firefox-home.nix b/modules/firefox-home.nix new file mode 100644 index 0000000..e244b87 --- /dev/null +++ b/modules/firefox-home.nix @@ -0,0 +1,9 @@ +{ ... }: +{ + systemd.user.services."firefox-autostart" = { + serviceConfig = { + ExecStart = ""; + ExecStop = ""; + }; + }; +} diff --git a/modules/firefox.nix b/modules/firefox.nix index 5378155..aa239b8 100644 --- a/modules/firefox.nix +++ b/modules/firefox.nix @@ -12,6 +12,10 @@ in { + home-manager.sharedModules = [ + ./firefox-home.nix + ]; + programs = { firefox = { enable = true; diff --git a/modules/noctalia/default.nix b/modules/noctalia/default.nix deleted file mode 100644 index 1faf2b3..0000000 --- a/modules/noctalia/default.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, inputs, pkgs, ... }: -{ - imports = [ - ]; - - home-manager.sharedModules = [ - ./home.nix - ]; - - environment.systemPackages = with pkgs; - [ - inputs.noctalia.packages.${system}.default - ]; -} diff --git a/modules/noctalia/home.nix b/modules/noctalia/home.nix deleted file mode 100644 index 8983bed..0000000 --- a/modules/noctalia/home.nix +++ /dev/null @@ -1,13 +0,0 @@ -{pkgs, inputs, ...}: -{ - imports = [ - inputs.noctalia.homeModules.default - ]; - - programs = { - noctalia-shell = { - enable = true; - systemd.enable = false; - }; - }; -} diff --git a/modules/packages.nix b/modules/packages.nix index c6cbcc6..e1724e1 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -34,6 +34,7 @@ mesa fprintd nh + whois #Programming #jetbrains.pycharm-community #The PyCharm IDE to edit Python code @@ -67,7 +68,7 @@ spotify rpi-imager kdePackages.yakuake - #atlauncher + atlauncher #discord vesktop wineWowPackages.stagingFull diff --git a/modules/portainer.nix b/modules/portainer.nix deleted file mode 100644 index c73aa6f..0000000 --- a/modules/portainer.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - containers.portainer = { - autoStart = true; - privateNetwork = true; - - config = { pkgs, ... }: { - services.docker.enable = true; - - systemd.services.portainer = { - description = "Portainer Container Manager"; - after = [ "docker.service" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = '' - ${pkgs.docker}/bin/docker run \ - -d \ - --name portainer \ - -p 9000:9000 \ - -p 9443:9443 \ - -v /var/run/docker.sock:/var/run/docker.sock \ - -v portainer_data:/data \ - portainer/portainer-ce:latest - ''; - ExecStop = "${pkgs.docker}/bin/docker stop portainer"; - Restart = "unless-stopped"; - }; - }; - - networking.firewall.allowedTCPPorts = [ 9000 9443 ]; - }; - }; -} diff --git a/modules/stylix/default.nix b/modules/stylix/default.nix index f69e4cb..3ebb4f8 100644 --- a/modules/stylix/default.nix +++ b/modules/stylix/default.nix @@ -12,6 +12,7 @@ stylix = { enable = true; + autoEnable = false; #So I can choose my programs it targets myself! image = ../../other/wallpaper2.png; #autoEnable = true; #Auto generate theme based on wallpaper base16Scheme = "${pkgs.base16-schemes}/share/themes/dracula.yaml"; @@ -36,8 +37,11 @@ }; }; targets = { - grub.enable = false; - qt.enable = false; + plymouth.enable = true; + plymouth.logoAnimated = true; + console.enable = true; #Default console without desktop environment! (NOT KITTY!) + #grub.enable = false; + #qt.enable = false; }; }; } diff --git a/modules/stylix/home.nix b/modules/stylix/home.nix index bd3e5e3..6109d7b 100644 --- a/modules/stylix/home.nix +++ b/modules/stylix/home.nix @@ -9,9 +9,9 @@ stylix = { targets = { - kitty.enable = false; - kde.enable = false; - zen-browser.profileNames = [ "${username}" ]; + #kitty.enable = false; + #kde.enable = false; + #zen-browser.profileNames = [ "${username}" ]; }; }; } diff --git a/niri/niri.nix b/niri/niri.nix index a6da5be..e7ff620 100644 --- a/niri/niri.nix +++ b/niri/niri.nix @@ -2,7 +2,6 @@ { imports = [ # ./autostart.nix - ../modules/noctalia ../modules/hyprlock ../modules/hyprpaper ../modules/stylix diff --git a/other/aliases b/other/aliases index 12ade40..944b55e 100644 --- a/other/aliases +++ b/other/aliases @@ -1,7 +1,5 @@ #Variables - - #---------- # Commands that will be used as aliases for zsh and bash #---------- @@ -9,7 +7,6 @@ # Common commands #----- alias py="python3" -#alias mcrow="sudo micro" alias mcrow="echo 'you better try to use nvim you little shit! :3'" alias srcals="source $HOME/NixOS/other/aliases && echo 'Sourced Aliases ... successful!'" alias please="sudo" @@ -22,36 +19,13 @@ alias neofetch="fastfetch" # Nix Specific commands #----- -#alias nix-upd="sudo nixos-rebuild switch --flake /etc/nixos" -#alias nix-update="sudo nixos-rebuild switch --flake /etc/nixos" -#alias nix-edit="sudoedit /etc/nixos/configuration.nix" -#alias nix-packages="sudoedit /etc/nixos/packages.nix" -#alias nix-pkgs="sudoedit /etc/nixos/packages.nix" -#alias nix-flake="sudoedit /etc/nixos/flake.nix" -#alias nix-edit-flake="sudoedit /etc/nixos/flake.nix" -#alias nix-zsh="sudoedit /etc/nixos/zsh.nix" -#alias nix-edit-zsh="sudoedit /etc/nixos/zsh.nix" -#alias nix-aliases="sudoedit /etc/nixos/other/aliases" -#alias nix-edit-aliases="sudoedit /etc/nixos/other/aliases" -#alias nix-regenerate-config="sudo nixos-generate-config" -#alias nix-home="sudoedit /etc/nixos/home.nix" alias nix-gc="sudo nix-store --gc" alias nix-clean="sudo nix-store --gc" alias nix-clear="sudo nix-store --gc" -#alias home-edit="sudoedit /etc/nixos/home.nix" - -#alias cd-nix="cd /etc/nixos/" - #KDE Plasma Specific #----- alias kde-theme-apply="source $HOME/NixOS/plasma/konsave.sh" -#Hyprland Specific -#----- -alias exit-hyprland="hyprctl dispatch exit" -alias hyprland-exit="hyprctl dispatch exit" -alias hypr-edit="sudoedit $HOME/NixOS/hyprland/hyprland.conf" - #LaTeX Commands alias makepdf="makeglossaries main && pdflatex main.tex" diff --git a/plasma/plasma.nix b/plasma/plasma.nix index fb11104..2088521 100644 --- a/plasma/plasma.nix +++ b/plasma/plasma.nix @@ -14,6 +14,7 @@ in imports = [ ./autostart.nix + ../modules/stylix ]; home-manager.sharedModules = [ @@ -26,6 +27,8 @@ in "sddm".serviceConfig.KillMode = "mixed"; }; + programs.gamemode.enable = true; + services = { xserver = { enable = true;