diff --git a/configuration.nix b/configuration.nix index 72665e6..08f5cfb 100644 --- a/configuration.nix +++ b/configuration.nix @@ -13,6 +13,8 @@ in { ./dotfiles/local/local-nixos.nix ]; + boot.kernel.sysctl = { "net.ipv6.conf.all.disable_ipv6" = true; "net.ipv6.conf.default.disable_ipv6" = true;}; + # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -29,6 +31,7 @@ in { # Enable networking networking.networkmanager.enable = true; + services.resolved.enable = true; services.printing.enable = true; services.avahi = { @@ -70,8 +73,9 @@ in { programs.hyprland.enable = true; services.xserver.enable = true; # You may need to comment out "services.displayManager.gdm.enable = true;" - services.displayManager.sddm.enable = true; - services.desktopManager.plasma6.enable = true; + services.xserver.displayManager.gdm.enable = true; + # services.desktopManager.plasma6.enable = true; + services.xserver.desktopManager.gnome.enable = true; # Configure console keymap console.keyMap = "sv-latin1"; @@ -137,9 +141,10 @@ in { waybar glib links2 - dolphin + picoscope + kdePackages.dolphin pkg-config - gnome.nautilus + nautilus kitty librewolf fuzzel @@ -151,7 +156,7 @@ in { git gnupg dmenu - gnome.adwaita-icon-theme + adwaita-icon-theme wtype cifs-utils ffmpeg @@ -206,6 +211,7 @@ in { zlib fuse3 icu + libmpc zlib nss openssl @@ -258,7 +264,6 @@ in { enable = true; package = pkgs.mlocate; interval = "hourly"; - localuser = null; }; programs.nix-ld.enable = true; programs.gnupg.agent = { @@ -276,7 +281,10 @@ in { services.xserver.xkb.variant = ""; fonts.packages = with pkgs; [ - (nerdfonts.override { fonts = [ "FiraCode" "RobotoMono" "JetBrainsMono" ]; }) + pkgs.nerd-fonts.fira-code + pkgs.nerd-fonts.comic-shanns-mono + pkgs.nerd-fonts.roboto-mono + pkgs.nerd-fonts.jetbrains-mono comic-mono ]; diff --git a/dotfiles/hypr/hyprland.conf b/dotfiles/hypr/hyprland.conf index 2e98667..8a8a89c 100644 --- a/dotfiles/hypr/hyprland.conf +++ b/dotfiles/hypr/hyprland.conf @@ -5,7 +5,9 @@ xwayland { # See https://wiki.hyprland.org/Configuring/Keywords/ for more source=~/.config/local/display.conf -exec-once = waybar & waypaper --restore +exec-once = waybar +# exec-once = mpvpaper -o "--speed=1 --video-zoom=0.2 --loop" eDP-1 .wallpapers/black-cat-sakura-bridge-pixel-moewalls-com.mp4 +exec-once = mpvpaper -o "--speed=1 --video-zoom=0.2 --loop" eDP-1 .wallpapers/pixel-lofi-city-moewalls-com.mp4 exec-once = mako exec-once = xhost +local: @@ -28,8 +30,8 @@ input { general { # See https://wiki.hyprland.org/Configuring/Variables/ for more - gaps_in = 0 - gaps_out = 0 + gaps_in = 5 + gaps_out = 10 border_size = 2 col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg col.inactive_border = rgba(595959aa) @@ -43,7 +45,7 @@ general { decoration { # See https://wiki.hyprland.org/Configuring/Variables/ for more - rounding = 0 + rounding = 5 blur { enabled = true @@ -52,10 +54,12 @@ decoration { special = true } - drop_shadow = no - shadow_range = 10 - shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) + shadow { + enabled = true + range = 10 + render_power = 3 + color = rgba(1a1a1aee) + } } animations { @@ -120,9 +124,9 @@ bind = $mainMod SHIFT, D, exec, ~/scripts/down.sh bind = $mainMod, U, exec, ~/scripts/up.sh bind = $mainMod SHIFT, L, exec, hyprlock bind = $mainMod SHIFT, S, exec, grimblast save area ss.png && wl-copy < ss.png +bind = $mainMod, N, exec, vimb http://networkcheck.kde.org bind = $mainMod SHIFT, R, forcerendererreload bind = $mainMod, P, pseudo, # dwindle -bind = $mainMod, F, fakefullscreen bind = $mainMod SHIFT, F, fullscreen, 0 # Move focus with mainMod + arrow keys @@ -143,6 +147,17 @@ bind = $mainMod, 8, workspace, 8 bind = $mainMod, 9, workspace, 9 bind = $mainMod, 0, workspace, 10 +workspace = 1, monitor:HDMI-A-1 +workspace = 2, monitor:eDP-1 +workspace = 3, monitor:eDP-1 +workspace = 4, monitor:HDMI-A-1 +workspace = 5, monitor:eDP-1 +workspace = 6, monitor:HDMI-A-1 +workspace = 7, monitor:eDP-1 +workspace = 8, monitor:eDP-1 +workspace = 9, monitor:eDP-1 +workspace = 10, monitor:eDP-1 + # Move active window to a workspace with mainMod + SHIFT + [0-9] bind = $mainMod SHIFT, 1, movetoworkspacesilent, 1 bind = $mainMod SHIFT, 2, movetoworkspacesilent, 2 diff --git a/dotfiles/kitty/kitty.conf b/dotfiles/kitty/kitty.conf index bb35717..9c4efcc 100644 --- a/dotfiles/kitty/kitty.conf +++ b/dotfiles/kitty/kitty.conf @@ -1,3 +1,3 @@ -font_family RobotoMono Nerd Font +font_family ComicShannsMono Nerd Font background_opacity 1 include mocha.conf diff --git a/dotfiles/wallpapers/autumn-rain-pixel-moewalls-com.mp4 b/dotfiles/wallpapers/autumn-rain-pixel-moewalls-com.mp4 new file mode 100644 index 0000000..a8af303 Binary files /dev/null and b/dotfiles/wallpapers/autumn-rain-pixel-moewalls-com.mp4 differ diff --git a/dotfiles/wallpapers/black-cat-sakura-bridge-pixel-moewalls-com.mp4 b/dotfiles/wallpapers/black-cat-sakura-bridge-pixel-moewalls-com.mp4 new file mode 100644 index 0000000..ddf79d2 Binary files /dev/null and b/dotfiles/wallpapers/black-cat-sakura-bridge-pixel-moewalls-com.mp4 differ diff --git a/dotfiles/wallpapers/pixel-lofi-city-moewalls-com.mp4 b/dotfiles/wallpapers/pixel-lofi-city-moewalls-com.mp4 new file mode 100644 index 0000000..edbeef1 Binary files /dev/null and b/dotfiles/wallpapers/pixel-lofi-city-moewalls-com.mp4 differ diff --git a/dotfiles/waybar/config.jsonc b/dotfiles/waybar/config.jsonc index b419324..6882b50 100644 --- a/dotfiles/waybar/config.jsonc +++ b/dotfiles/waybar/config.jsonc @@ -26,11 +26,11 @@ // Modules configuration "hyprland/workspaces": { "disable-scroll": true, - "all-outputs": false, + "all-outputs": true, "warp-on-scroll": false, "active-only": false, "format": "{icon}", - "persistent-workspaces": {"*": 9}, + "persistent-workspaces": {}, "format-icons": { "1": "", "2": "", diff --git a/flake.lock b/flake.lock index 54225e5..61c6418 100644 --- a/flake.lock +++ b/flake.lock @@ -7,31 +7,32 @@ ] }, "locked": { - "lastModified": 1710062421, - "narHash": "sha256-FiCNRfyUgJOLYIokLiFsfI7B+Zn9HDnOzFR3uVr5qsQ=", + "lastModified": 1739757849, + "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=", "owner": "nix-community", "repo": "home-manager", - "rev": "36f873dfc8e2b6b89936ff3e2b74803d50447e0a", + "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1709961763, - "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", + "lastModified": 1739758141, + "narHash": "sha256-uq6A2L7o1/tR6VfmYhZWoVAwb3gTy7j4Jx30MIrH0rE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", + "rev": "c618e28f70257593de75a7044438efc1c1fc0791", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index ec1eb29..84020f9 100644 --- a/flake.nix +++ b/flake.nix @@ -3,9 +3,9 @@ inputs = { # Specify the source of Home Manager and Nixpkgs. - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-24.11"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/home.nix b/home.nix index 04245e7..c93cc87 100644 --- a/home.nix +++ b/home.nix @@ -19,15 +19,24 @@ mako kdePackages.kalgebra libreoffice + spotify + hexchat + weechat + mpv + slack + mpvpaper htop + vimb vlc paprefs ripgrep chromium xwaylandvideobridge + element-desktop qtpass pipewire jdk21 + eww wireplumber xdg-desktop-portal-hyprland qt6.qtwayland @@ -36,13 +45,10 @@ clang obs-studio prismlauncher - prusa-slicer freecad direnv easyeffects tmux - kicad - spotify arduino-ide gimp feh