diff --git a/configuration.nix b/configuration.nix index c955d28..32177ef 100644 --- a/configuration.nix +++ b/configuration.nix @@ -101,12 +101,16 @@ boot = { # Enable the GNOME Desktop Environment. - programs.hyprland.enable = false; - services.desktopManager.plasma6.enable = true; - services.displayManager.sddm.enable = true; + programs.hyprland.enable = true; + services.desktopManager.plasma6.enable = false; + services.displayManager.sddm.enable = false; services.displayManager.cosmic-greeter.enable = false; services.desktopManager.cosmic.enable = true; - /*security.pam.services.hyprlock = {}; + /*services.displayManager = { + autoLogin.enable = true; + autoLogin.user = "joshuaelm"; +};*/ + security.pam.services.hyprlock = {}; services.greetd = { enable = true; @@ -117,12 +121,10 @@ boot = { }; default_session = initial_session; }; - };*/ + }; # Steam Deck Gamemode programs.steam.gamescopeSession.enable = true; - services.getty.autologinUser = "joshuaelm"; - environment.loginShellInit = ''[[ "$(tty)" = "/dev/tty1" ]] && ~/NixOS-Config gs.sh''; # Polkit @@ -254,10 +256,10 @@ hardware.pulseaudio.extraConfig = '' targetPkgs = pkgs: with pkgs; [ alsa-lib atk cairo cups curl dbus expat file fish fontconfig freetype fuse glib gtk3 libGL libnotify libxml2 libxslt netcat nspr nss openjdk8 - openssl.dev pango pkg-config strace udev vulkan-loader watch wget which - xorg.libX11 xorg.libxcb xorg.libXcomposite xorg.libXcursor + openssl.dev pango appimage-run pkg-config strace udev vulkan-loader watch wget which + xorg.libX11 icu xorg.libxcb xorg.libXcomposite xorg.libXcursor xorg.libXdamage xorg.libXext xorg.libXfixes xorg.libXi xorg.libXrandr - xorg.libXrender xorg.libXScrnSaver xorg.libxshmfence xorg.libXtst + xorg.libXrender xorg.libXScrnSaver openssl xorg.libxshmfence xorg.libXtst xorg.xcbutilkeysyms zlib fontconfig.lib libuuid xorg.libXft ]; profile = ''export FHS=1''; @@ -267,7 +269,9 @@ hardware.pulseaudio.extraConfig = '' bibata-cursors killall mangohud + aonsoku teamspeak3 + cemu teamspeak6-client unetbootin winetricks @@ -302,7 +306,7 @@ hardware.pulseaudio.extraConfig = '' nssTools qt5.full dconf - openjdk + openjdk23 heroic protontricks gamescope @@ -367,8 +371,8 @@ hardware.pulseaudio.extraConfig = '' services.openssh.allowSFTP = true; # Open ports in the firewall. - networking.firewall.allowedTCPPorts = [ 7860 3042 47990 5001 ]; - networking.firewall.allowedUDPPorts = [ 7860 3042 47990 ]; + networking.firewall.allowedTCPPorts = [ 7860 3042 47990 48010 5001 ]; + networking.firewall.allowedUDPPorts = [ 7860 3042 47990 4800 48010 ]; # Or disable the firewall altogether. # networking.firewall.enable = false; diff --git a/flake.lock b/flake.lock index 53cbc59..a423ad0 100644 --- a/flake.lock +++ b/flake.lock @@ -68,11 +68,11 @@ ] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -106,11 +106,32 @@ ] }, "locked": { - "lastModified": 1742588233, - "narHash": "sha256-Fi5g8H5FXMSRqy+mU6gPG0v+C9pzjYbkkiePtz8+PpA=", + "lastModified": 1745894335, + "narHash": "sha256-m47zhftaod/oHOwoVT25jstdcVLhkrVGyvEHKjbnFHI=", "owner": "nix-community", "repo": "home-manager", - "rev": "296ddc64627f4a6a4eb447852d7346b9dd16197d", + "rev": "1ad123239957d40e11ef66c203d0a7e272eb48aa", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "zen-browser", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1743604125, + "narHash": "sha256-ZD61DNbsBt1mQbinAaaEqKaJk2RFo9R/j+eYWeGMx7A=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "180fd43eea296e62ae68e079fcf56aba268b9a1a", "type": "github" }, "original": { @@ -125,11 +146,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1742402033, - "narHash": "sha256-aaBdTUJIAo9LBPpjNX96AoAi0H+O/oW8o+7SCVBAzXI=", + "lastModified": 1745885816, + "narHash": "sha256-yuIb6/gGcII+2YgtTLcYdga0pcL63B18xQ/oitOhg7k=", "owner": "Jas-SinghFSU", "repo": "HyprPanel", - "rev": "3a5ad2a1db420f0238895f2cb1ff64acd0d2cc54", + "rev": "0c82ce9704c8063be8d8f60443071c91943eb68c", "type": "github" }, "original": { @@ -152,27 +173,27 @@ ] }, "locked": { - "lastModified": 1729958008, - "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=", + "lastModified": 1737371634, + "narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=", "owner": "NuschtOS", "repo": "ixx", - "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb", + "rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648", "type": "github" }, "original": { "owner": "NuschtOS", - "ref": "v0.0.6", + "ref": "v0.0.7", "repo": "ixx", "type": "github" } }, "master": { "locked": { - "lastModified": 1742667061, - "narHash": "sha256-gxEMqQ3faiBhzxyRKJWw0zaePAE7zJPxwGvtKDIap5A=", + "lastModified": 1745949758, + "narHash": "sha256-/dnFkNd00YPbzyu9yzTe/5Zk/3Tg4m3OwBBYvZlx8lQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0830a0bb3aa85c88c01f8a01238856d884273e25", + "rev": "4eba10d36219a263a5b51e4a6b2e4e6bbc00fcde", "type": "github" }, "original": { @@ -188,14 +209,15 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable", + "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1742641703, - "narHash": "sha256-hoN8blvJco8OSZmPj8izwQaQUdydVi+5FO4/nWd1MNU=", + "lastModified": 1745924915, + "narHash": "sha256-RuMUtaplJkaAtqkdG1+cD3trqmO2ykKqfK+3+HXPUVA=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "216557e6cd229dbe7d73a497c227824a3c579cd7", + "rev": "329a9d639f0418cce05937a823f43b2b64191653", "type": "github" }, "original": { @@ -222,11 +244,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1742512142, - "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=", + "lastModified": 1745742390, + "narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682", + "rev": "26245db0cb552047418cfcef9a25da91b222d6c7", "type": "github" }, "original": { @@ -238,11 +260,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "lastModified": 1745794561, + "narHash": "sha256-T36rUZHUART00h3dW4sV5tv4MrXKT7aWjNfHiZz7OHg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "rev": "5461b7fa65f3ca74cef60be837fd559a8918eaa0", "type": "github" }, "original": { @@ -253,11 +275,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1742288794, - "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=", + "lastModified": 1743448293, + "narHash": "sha256-bmEPmSjJakAp/JojZRrUvNcDX2R5/nuX6bm+seVaGhs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42", + "rev": "77b584d61ff80b4cef9245829a6f1dfad5afdfa3", "type": "github" }, "original": { @@ -276,11 +298,11 @@ "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1742559284, - "narHash": "sha256-PSSjCCqpJPkCagkkdLODBVVonGxgwU5dN2CYlFPNVNw=", + "lastModified": 1745927529, + "narHash": "sha256-9ofvr5N24TOLjJTkUNdoaHE20l/+r04/9PMw4tmj6dE=", "owner": "nix-community", "repo": "nixvim", - "rev": "c980271267ef146a6c30394c611a97e077471cf2", + "rev": "944a3168813367bb71389c53b94992f69b5be79f", "type": "github" }, "original": { @@ -299,11 +321,11 @@ ] }, "locked": { - "lastModified": 1741886583, - "narHash": "sha256-sScfYKtxp3CYv5fJcHQDvQjqBL+tPNQqS9yf9Putd+s=", + "lastModified": 1745046075, + "narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=", "owner": "NuschtOS", "repo": "search", - "rev": "2974bc5fa3441a319fba943f3ca41f7dcd1a1467", + "rev": "066afe8643274470f4a294442aadd988356a478f", "type": "github" }, "original": { @@ -323,6 +345,27 @@ "zen-browser": "zen-browser" } }, + "rust-overlay": { + "inputs": { + "nixpkgs": [ + "nixos-cosmic", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1745894113, + "narHash": "sha256-dxO3caQZMv/pMtcuXdi+SnAtyki6HFbSf1IpgQPXZYc=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "e552fe1b16ffafd678ebe061c22b117e050769ed", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -340,14 +383,15 @@ }, "zen-browser": { "inputs": { + "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1742614294, - "narHash": "sha256-bZbYlP/xqGyW2aVle742dFbc0npFnwJBzcEnXNywJgY=", + "lastModified": 1745943904, + "narHash": "sha256-AJ4AFfiIAW9N/qztn9DxeY+/PJqFZIbpRGk21keSC0Y=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "7fa9ec4e14d89e568ebaac302049980df7cf0cc9", + "rev": "64670840168a8ac7cc3a60f5e405a64c7bcd4b45", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index 7febfab..3afb50e 100644 --- a/home.nix +++ b/home.nix @@ -12,11 +12,12 @@ home.packages = [ pkgs.element-desktop pkgs.waybar - pkgs.signal-desktop + pkgs.signal-desktop-bin pkgs.swaybg pkgs.kitty - pkgs.supersonic-wayland + pkgs.supersonic pkgs.adw-gtk3 + pkgs.cava ]; programs.hyprlock.enable = true; diff --git a/modules/cava/config b/modules/cava/config index 87a8c5c..78d8fb9 100644 --- a/modules/cava/config +++ b/modules/cava/config @@ -165,7 +165,7 @@ ; continuous_rendering = 0 [color] -gradient = 1 +gradient = 0 gradient_count = 8 #GruvBox Green to Red Gradient @@ -177,6 +177,7 @@ gradient_color_5 = '#fabd2f' gradient_color_6 = '#d65d0e' gradient_color_7 = '#cc241d' gradient_color_8 = '#cc241d' +color = '#3b4252' [smoothing] diff --git a/modules/hypr/hyprland.conf b/modules/hypr/hyprland.conf index 066aaaa..b1813c0 100644 --- a/modules/hypr/hyprland.conf +++ b/modules/hypr/hyprland.conf @@ -142,8 +142,10 @@ bind = $mainMod, M, exec, hyprlock bind = $mainMod, E, exec, $fileManager bind = $mainMod, V, togglefloating, bind = $mainMod, Space, exec, $menu +bind = $mainMod, B, exec, zen bind = $mainMod, P, pseudo, # dwindle bind = $mainMod, J, togglesplit, # dwindle +bind = $mainMod, F, fullscreen, bind = , XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%+ bind = , XF86AudioLowerVolume, exec, wpctl set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 5%- diff --git a/modules/hyprpanel/options.json b/modules/hyprpanel/options.json index b0e4ecb..fa1e86c 100644 --- a/modules/hyprpanel/options.json +++ b/modules/hyprpanel/options.json @@ -1,22 +1,22 @@ { "bar.customModules.updates.pollingInterval": 1440000, - "menus.transition": "none", + "menus.transition": "crossfade", "theme.bar.menus.monochrome": false, "theme.bar.transparent": false, "theme.bar.menus.card_radius": "0.4em", "theme.bar.menus.border.radius": "0.7em", - "theme.bar.menus.border.size": "5px", + "theme.bar.menus.border.size": "0.13em", "theme.bar.floating": true, - "theme.bar.outer_spacing": "1px", + "theme.bar.outer_spacing": "1.6em", "theme.bar.border.location": "none", "theme.bar.location": "top", "theme.bar.buttons.enableBorders": false, "menus.clock.time.military": true, "menus.clock.time.hideSeconds": true, "menus.clock.weather.location": "Cedar Hill", - "theme.bar.border_radius": "10px", + "theme.bar.border_radius": "0.4em", "theme.bar.buttons.workspaces.enableBorder": false, - "theme.bar.buttons.radius": "10px", + "theme.bar.buttons.radius": "0.3em", "theme.bar.buttons.padding_y": "0.2rem", "theme.bar.buttons.padding_x": "0.7rem", "theme.bar.margin_sides": "0.5em", @@ -31,7 +31,7 @@ "menus.dashboard.directories.enabled": false, "menus.dashboard.stats.enable_gpu": false, "menus.bluetooth.showBattery": true, - "theme.font.name": "Roboto", + "theme.font.name": "Ubuntu Nerd Font", "scalingPriority": "hyprland", "bar.customModules.netstat.dynamicIcon": false, "theme.bar.buttons.modules.netstat.enableBorder": false, @@ -105,5 +105,15 @@ "bar.workspaces.icons.occupied": "", "theme.bar.opacity": 100, "theme.bar.buttons.monochrome": false, - "theme.bar.buttons.notifications.enableBorder": false + "theme.bar.buttons.notifications.enableBorder": false, + "theme.bar.menus.enableShadow": true, + "theme.bar.buttons.opacity": 100, + "theme.bar.enableShadow": true, + "theme.bar.menus.buttons.radius": "0.4em", + "theme.bar.menus.shadow": "1px 1px 2px 1px #323232cc", + "theme.bar.menus.shadowMargins": "5px 5px", + "theme.bar.shadow": "1px 1px 2px 1px #323232cc", + "theme.bar.buttons.dashboard.enableBorder": false, + "theme.bar.buttons.windowtitle.enableBorder": false, + "menus.transitionTime": 1 } \ No newline at end of file diff --git a/modules/kitty/kitty.conf b/modules/kitty/kitty.conf index ffa4166..dea7721 100644 --- a/modules/kitty/kitty.conf +++ b/modules/kitty/kitty.conf @@ -1,4 +1,4 @@ -include themes/tokyo-night-kitty.conf +include themes/nord.conf font_family Fira Code Nerd Font bold_font auto @@ -6,6 +6,4 @@ italic_font auto bold_italic_font auto confirm_os_window_close 0 -background_opacity 0.8 -background_blur 0 cursor_shape beam diff --git a/modules/kitty/themes/nord.conf b/modules/kitty/themes/nord.conf new file mode 100644 index 0000000..54f3a96 --- /dev/null +++ b/modules/kitty/themes/nord.conf @@ -0,0 +1,43 @@ +# Nord Colorscheme for Kitty +# Based on: +# - https://gist.github.com/marcusramberg/64010234c95a93d953e8c79fdaf94192 +# - https://github.com/arcticicestudio/nord-hyper + +foreground #D8DEE9 +background #2E3440 +selection_foreground #000000 +selection_background #FFFACD +url_color #0087BD +cursor #81A1C1 + +# black +color0 #3B4252 +color8 #4C566A + +# red +color1 #BF616A +color9 #BF616A + +# green +color2 #A3BE8C +color10 #A3BE8C + +# yellow +color3 #EBCB8B +color11 #EBCB8B + +# blue +color4 #81A1C1 +color12 #81A1C1 + +# magenta +color5 #B48EAD +color13 #B48EAD + +# cyan +color6 #88C0D0 +color14 #8FBCBB + +# white +color7 #E5E9F0 +color15 #ECEFF4 diff --git a/modules/nvim/default.nix b/modules/nvim/default.nix index 908231c..e1204d4 100644 --- a/modules/nvim/default.nix +++ b/modules/nvim/default.nix @@ -3,7 +3,7 @@ { programs.nixvim = { enable = true; - colorschemes.tokyonight.enable = true; + colorschemes.nord.enable = true; plugins.nvim-tree.enable = true; plugins.treesitter.enable = true; plugins.lualine.enable = true; diff --git a/modules/rofi/apps.rasi b/modules/rofi/apps.rasi index 96cb711..81d01ea 100644 --- a/modules/rofi/apps.rasi +++ b/modules/rofi/apps.rasi @@ -14,4 +14,4 @@ configuration { } -@theme "~/.config/rofi/tokyo-night.rasi" +@theme "~/.config/rofi/nord.rasi" diff --git a/modules/rofi/config.rasi b/modules/rofi/config.rasi index 445f312..c8cc27c 100644 --- a/modules/rofi/config.rasi +++ b/modules/rofi/config.rasi @@ -13,4 +13,4 @@ configuration { } -@theme "~/.config/rofi/tokyo-night.rasi" +@theme "~/.config/rofi/nord.rasi" diff --git a/modules/rofi/nord.rasi b/modules/rofi/nord.rasi new file mode 100644 index 0000000..1f1ba24 --- /dev/null +++ b/modules/rofi/nord.rasi @@ -0,0 +1,132 @@ +* { + scrollbar: false; + + bg: #3b4252; + bg-dark: #2e3440; + bg-highlight: #4c566a; + fg: #c0caf5; + fg-dark: #3b4261; + red-dark: #bf616a; + red-light: #bf616a; + yellow: #ebcb8b; + orange: #d08770; + gray: #565f89; + + background: @bg-dark; + background-color: @background; + foreground: @fg; + border-color: @gray; + separatorcolor: @border-color; + scrollbar-handle: @border-color; + + normal-background: @background; + normal-foreground: @foreground; + alternate-normal-background: @bg-dark; + alternate-normal-foreground: @fg; + selected-normal-background: @bg-highlight; + selected-normal-foreground: @fg; + + active-background: @orange; + active-foreground: @bg; + alternate-active-background: @active-background; + alternate-active-foreground: @active-foreground; + selected-active-background: @yellow; + selected-active-foreground: @active-foreground; + + urgent-background: @red-dark; + urgent-foreground: @background; + alternate-urgent-background: @urgent-background; + alternate-urgent-foreground: @urgent-foreground; + selected-urgent-background: @red-dark; + selected-urgent-foreground: @urgent-foreground; +} + +window { + height: 600; + width: 600; + + border-radius: 10; +} + +mainbox { + spacing: 0; + children: [inputbar, message, listview]; +} + +inputbar { + color: @normal-foreground; + padding: 14; + background-color: @background; +} + +message { + padding: 10; + background-color: @background; +} + +listview { + padding: 8; + border-radius: 0 0 10 10; + border: 2 2 2 2; + border-color: @background; + background-color: @background; + dynamic: false; +} + +textbox { + text-color: @normal-foreground; +} + +error-message { + border: 20 20 20 20; +} + +entry, prompt, case-indicator { + text-color: inherit; +} + +prompt { + margin: 0 10 0 0; +} + +element { + padding: 5; + vertical-align: 0.5; + border-radius: 10; + text-color: @normal-foreground; + background-color: @normal-background; +} + +element.selected.normal { + background-color: @selected-normal-background; +} + +element.alternate.normal { + background-color: inherit; +} + +element.normal.active, element.alternate.active { + background-color: @background; +} + +element.selected.active { + background-color: @selected-normal-background; +} + +element.normal.urgent, element.alternate.urgent { + background-color: @urgent-background; +} + +element.selected.urgent { + background-color: @urgent-background; +} + +element-text, element-icon { + size: 40; + margin: 0 10 0 0; + vertical-align: 0.5; + background-color: inherit; + text-color: @normal-foreground; +} + +