diff --git a/configuration.nix b/configuration.nix index ff62024..3921441 100755 --- a/configuration.nix +++ b/configuration.nix @@ -12,7 +12,8 @@ { config, pkgs, lib, username, ... }: { - +# stylix.enable = true; +# stylix.image = /etc/nixos/other/wallpaper.png; # in configuration.nix #Assign Swap to the PC #swapDevices = [{ @@ -113,12 +114,18 @@ xserver = { enable = true; + xkb = { layout = "de"; variant = ""; }; -# desktopManager.gnome.enable = true; + desktopManager = { + #gnome.enable = true; + xterm.enable = false; + }; + + excludePackages = [ pkgs.xterm ]; ## Enable sound with pipewire. #services.pulseaudio.enable = false; }; @@ -215,7 +222,8 @@ }; environment.sessionVariables = { - NIXOS_OZONE_WL = "1"; + NIXOS_OZONE_WL = "1"; #For chromium to work under wayland and with virtual Keyboards (Only really needed for virtual keyboards, but doest hurt ...) + TERMINAL = "kitty"; }; diff --git a/flake.lock b/flake.lock index 2049deb..10d4d5a 100755 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,143 @@ { "nodes": { + "base16": { + "inputs": { + "fromYaml": "fromYaml" + }, + "locked": { + "lastModified": 1755819240, + "narHash": "sha256-qcMhnL7aGAuFuutH4rq9fvAhCpJWVHLcHVZLtPctPlo=", + "owner": "SenchoPens", + "repo": "base16.nix", + "rev": "75ed5e5e3fce37df22e49125181fa37899c3ccd6", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "base16.nix", + "type": "github" + } + }, + "base16-fish": { + "flake": false, + "locked": { + "lastModified": 1754405784, + "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=", + "owner": "tomyun", + "repo": "base16-fish", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "type": "github" + }, + "original": { + "owner": "tomyun", + "repo": "base16-fish", + "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561", + "type": "github" + } + }, + "base16-helix": { + "flake": false, + "locked": { + "lastModified": 1752979451, + "narHash": "sha256-0CQM+FkYy0fOO/sMGhOoNL80ftsAzYCg9VhIrodqusM=", + "owner": "tinted-theming", + "repo": "base16-helix", + "rev": "27cf1e66e50abc622fb76a3019012dc07c678fac", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-helix", + "type": "github" + } + }, + "base16-vim": { + "flake": false, + "locked": { + "lastModified": 1732806396, + "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-vim", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", + "type": "github" + } + }, + "firefox-gnome-theme": { + "flake": false, + "locked": { + "lastModified": 1758112371, + "narHash": "sha256-lizRM2pj6PHrR25yimjyFn04OS4wcdbc38DCdBVa2rk=", + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "rev": "0909cfe4a2af8d358ad13b20246a350e14c2473d", + "type": "github" + }, + "original": { + "owner": "rafaelmardojai", + "repo": "firefox-gnome-theme", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1756770412, + "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "4524271976b625a4a605beefd893f270620fd751", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "fromYaml": { + "flake": false, + "locked": { + "lastModified": 1731966426, + "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=", + "owner": "SenchoPens", + "repo": "fromYaml", + "rev": "106af9e2f715e2d828df706c386a685698f3223b", + "type": "github" + }, + "original": { + "owner": "SenchoPens", + "repo": "fromYaml", + "type": "github" + } + }, + "gnome-shell": { + "flake": false, + "locked": { + "lastModified": 1748186689, + "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=", + "owner": "GNOME", + "repo": "gnome-shell", + "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0", + "type": "github" + }, + "original": { + "owner": "GNOME", + "ref": "48.2", + "repo": "gnome-shell", + "type": "github" + } + }, "grub2-themes": { "inputs": { "nixpkgs": "nixpkgs" @@ -60,6 +198,21 @@ "type": "github" } }, + "nix-flatpak": { + "locked": { + "lastModified": 1754777568, + "narHash": "sha256-0bBqT+3XncgF8F03RFAamw9vdf0VmaDoIJLTGkjfQZs=", + "owner": "gmodena", + "repo": "nix-flatpak", + "rev": "62f636b87ef6050760a8cb325cadb90674d1e23e", + "type": "github" + }, + "original": { + "owner": "gmodena", + "repo": "nix-flatpak", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1755078863, @@ -92,14 +245,171 @@ "type": "github" } }, + "nur": { + "inputs": { + "flake-parts": [ + "stylix", + "flake-parts" + ], + "nixpkgs": [ + "stylix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1758998580, + "narHash": "sha256-VLx0z396gDCGSiowLMFz5XRO/XuNV+4EnDYjdJhHvUk=", + "owner": "nix-community", + "repo": "NUR", + "rev": "ba8d9c98f5f4630bcb0e815ab456afd90c930728", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "root": { "inputs": { "grub2-themes": "grub2-themes", "home-manager": "home-manager", + "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs_2", + "stylix": "stylix", "zen-browser": "zen-browser" } }, + "stylix": { + "inputs": { + "base16": "base16", + "base16-fish": "base16-fish", + "base16-helix": "base16-helix", + "base16-vim": "base16-vim", + "firefox-gnome-theme": "firefox-gnome-theme", + "flake-parts": "flake-parts", + "gnome-shell": "gnome-shell", + "nixpkgs": [ + "nixpkgs" + ], + "nur": "nur", + "systems": "systems", + "tinted-foot": "tinted-foot", + "tinted-kitty": "tinted-kitty", + "tinted-schemes": "tinted-schemes", + "tinted-tmux": "tinted-tmux", + "tinted-zed": "tinted-zed" + }, + "locked": { + "lastModified": 1760472212, + "narHash": "sha256-4C3I/ssFsq8EgaUmZP0xv5V7RV0oCHgL/Rx+MUkuE+E=", + "owner": "nix-community", + "repo": "stylix", + "rev": "8d008296a1b3be9b57ad570f7acea00dd2fc92db", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "stylix", + "type": "github" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "tinted-foot": { + "flake": false, + "locked": { + "lastModified": 1726913040, + "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=", + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-foot", + "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4", + "type": "github" + } + }, + "tinted-kitty": { + "flake": false, + "locked": { + "lastModified": 1735730497, + "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=", + "owner": "tinted-theming", + "repo": "tinted-kitty", + "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-kitty", + "type": "github" + } + }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1757716333, + "narHash": "sha256-d4km8W7w2zCUEmPAPUoLk1NlYrGODuVa3P7St+UrqkM=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "317a5e10c35825a6c905d912e480dfe8e71c7559", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, + "tinted-tmux": { + "flake": false, + "locked": { + "lastModified": 1757811970, + "narHash": "sha256-n5ZJgmzGZXOD9pZdAl1OnBu3PIqD+X3vEBUGbTi4JiI=", + "owner": "tinted-theming", + "repo": "tinted-tmux", + "rev": "d217ba31c846006e9e0ae70775b0ee0f00aa6b1e", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "tinted-tmux", + "type": "github" + } + }, + "tinted-zed": { + "flake": false, + "locked": { + "lastModified": 1757811247, + "narHash": "sha256-4EFOUyLj85NRL3OacHoLGEo0wjiRJzfsXtR4CZWAn6w=", + "owner": "tinted-theming", + "repo": "base16-zed", + "rev": "824fe0aacf82b3c26690d14e8d2cedd56e18404e", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "base16-zed", + "type": "github" + } + }, "zen-browser": { "inputs": { "home-manager": "home-manager_2", diff --git a/flake.nix b/flake.nix index 60090f1..43c4301 100755 --- a/flake.nix +++ b/flake.nix @@ -1,4 +1,4 @@ -{ +{ description = "NixOS configuration"; inputs = { @@ -9,12 +9,17 @@ zen-browser.url = "github:0xc000022070/zen-browser-flake"; zen-browser.inputs.nixpkgs.follows = "nixpkgs"; + + stylix.url = "github:nix-community/stylix"; + stylix.inputs.nixpkgs.follows = "nixpkgs"; + + nix-flatpak.url = "github:gmodena/nix-flatpak"; - grub2-themes = { url = "github:vinceliuice/grub2-themes"; }; + grub2-themes.url = "github:vinceliuice/grub2-themes"; }; - outputs = inputs@{ nixpkgs, home-manager, zen-browser, grub2-themes, ... }: + outputs = inputs@{ nixpkgs, home-manager, stylix, zen-browser, grub2-themes, nix-flatpak, ... }: let username = "cookiez"; version = "25.05"; @@ -40,6 +45,8 @@ ./neovim.nix ./packages.nix grub2-themes.nixosModules.default + nix-flatpak.nixosModules.nix-flatpak + stylix.nixosModules.stylix home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; diff --git a/home.nix b/home.nix index 37595b3..b41db40 100755 --- a/home.nix +++ b/home.nix @@ -24,7 +24,8 @@ # changes in each release. home.stateVersion = version; - xdg.desktopEntries.youtube = { +xdg = { + desktopEntries.youtube = { name = "YouTube"; exec = "chromium --app=https://www.youtube.com"; terminal = false; @@ -32,11 +33,21 @@ icon = "applications-multimedia"; categories = [ "AudioVideo" "Player" "Network" ]; }; +}; # Let Home Manager install and manage itself. programs = { home-manager = { enable = true; }; + + kitty = { + enable = true; + settings = { + background_opacity = "0.7"; #The higher the value, the darker the console + }; + }; + + git = { enable = true; userName = "Cookiez"; diff --git a/hyprland/hyprland.nix b/hyprland/hyprland.nix index c77b6a6..6e1fbf8 100755 --- a/hyprland/hyprland.nix +++ b/hyprland/hyprland.nix @@ -11,7 +11,7 @@ hyprpaper sway #Sway Wayland compositor - kitty #Terminal + #kitty #Terminal (Already Included by default) rofi-wayland #Search bar (Meta + Space) ]; diff --git a/other/aliases b/other/aliases index ea88245..7a1e5c0 100755 --- a/other/aliases +++ b/other/aliases @@ -9,6 +9,7 @@ alias py="python3" alias mcrow="echo 'you better try to use nvim you little shit! :3'" alias srcals="source /etc/nixos/other/aliases && echo 'Sourced Aliases ... successful!'" alias please="sudo" +alias se="sudoedit" alias neofetch="fastfetch" diff --git a/other/wallpaper2.png b/other/wallpaper2.png new file mode 100644 index 0000000..8dc8ba4 Binary files /dev/null and b/other/wallpaper2.png differ diff --git a/packages.nix b/packages.nix index a693d8e..5908047 100755 --- a/packages.nix +++ b/packages.nix @@ -1,4 +1,4 @@ -{config, pkgs, libs, inputs, ...}: +{config, pkgs, libs, inputs, nix-flatpak, ...}: { environment.systemPackages = with pkgs; [ #Essenteals (CLI Only) @@ -47,9 +47,10 @@ vlc #steam #heroic + lutris #putty Need to find alternative as it sucks on linux mission-center - trayscale #sudo tailscale set --operator=$USER --> Needed to make it work! + trayscale spotify rpi-imager kdePackages.yakuake @@ -62,11 +63,12 @@ #i2p gparted #Disk partition Manager #rustdesk - mediawriter realvnc-vnc-viewer eddie #AirVPN desktop client chromium #For Youtube app to work kdePackages.bluez-qt + #latte-dock + kitty #CLI tools yt-dlp @@ -84,4 +86,23 @@ "dotnet-sdk-6.0.428" "dotnet-runtime-6.0.36" ]; + +services.flatpak = { + enable = true; + + remotes = [ + { + name = "flathub"; + location = "https://dl.flathub.org/repo/flathub.flatpakrepo"; + } + ]; + packages = [ + { + appId = "org.vinegarhq.Sober"; + origin = "flathub"; + commit = "e28fd81675b0871614ccdc8fc66c6da6761dd11333a65900a0451edf07ef0ea6"; + } + ]; +}; + } diff --git a/plasma/theme.knsv b/plasma/Arch-old.knsv similarity index 100% rename from plasma/theme.knsv rename to plasma/Arch-old.knsv diff --git a/plasma/NixOS-1.0.0.knsv b/plasma/NixOS-1.0.0.knsv new file mode 100644 index 0000000..a395f81 Binary files /dev/null and b/plasma/NixOS-1.0.0.knsv differ diff --git a/plasma/autostart.nix b/plasma/autostart.nix index a298dc1..06ae83e 100755 --- a/plasma/autostart.nix +++ b/plasma/autostart.nix @@ -4,12 +4,12 @@ #To show logs of services run: journalctl --user-unit={service-name} --user systemd.user.services.set-wallpaper = { - enable = true; + enable = false; description = "Set KDE Plasma wallpaper"; #after = [ "plasma-desktop.service" ]; wantedBy = [ "graphical-session.target" ]; serviceConfig = { - ExecStart = [ "/run/current-system/sw/bin/plasma-apply-wallpaperimage /etc/nixos/other/wallpaper.png" ]; + ExecStart = [ "/run/current-system/sw/bin/plasma-apply-wallpaperimage /etc/nixos/other/wallpaper2.png" ]; Type = "oneshot"; Restart = "on-failure"; diff --git a/plasma/kde-plasma.nix b/plasma/kde-plasma.nix index 1e512c6..a372eae 100755 --- a/plasma/kde-plasma.nix +++ b/plasma/kde-plasma.nix @@ -46,7 +46,12 @@ in # Enable the KDE Plasma Desktop Environment. services.desktopManager.plasma6.enable = true; - + + environment.plasma6.excludePackages = with pkgs; [ +# kdePackages.konsole #Using Kitty instead + kdePackages.elisa + ]; + environment.systemPackages = with pkgs; [ # (pkgs.writeTextDir "share/sddm/themes/breeze/theme.conf.user" '' # [General] diff --git a/plasma/konsave.sh b/plasma/konsave.sh index c415c7d..2f44327 100755 --- a/plasma/konsave.sh +++ b/plasma/konsave.sh @@ -1,8 +1,8 @@ source /etc/nixos/other/colors.sh FLAG_FILE="/home/cookiez/.flags/theme-flag" -/run/current-system/sw/bin/konsave -i /etc/nixos/plasma/theme.knsv -/run/current-system/sw/bin/konsave -i /etc/nixos/plasma/theme.knsv +/run/current-system/sw/bin/konsave -i /etc/nixos/plasma/NixOS-1.0.0.knsv +/run/current-system/sw/bin/konsave -i /etc/nixos/plasma/NixOS-1.0.0.knsv /run/current-system/sw/bin/konsave -a theme progress_bar() {