diff --git a/configuration.nix b/configuration.nix index 7cb4c36..d045cc2 100644 --- a/configuration.nix +++ b/configuration.nix @@ -80,38 +80,19 @@ home-manager.users.nat = import ./home.nix; - #nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - # "unityhub" - # "corefonts" - #]; - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "steam" "steam-unwrapped" - ]; - #services.flatpak.enable = true; - #xdg.portal.enable = true; - - # List packages installed in system profile. # You can use https://search.nixos.org/ to find more packages (and options). environment.systemPackages = with pkgs; [ kakoune # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. wget git - ddate gay - gcc blahaj - sl ]; # Allow swaylock to work security.pam.services.swaylock = { }; - programs.steam = { - enable = true; - remotePlay.openFirewall = true; - }; - # Some programs need SUID wrappers, can be configured further or are # started in user sessions. diff --git a/flake.lock b/flake.lock index 832b13d..4dee4f2 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1763416652, - "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=", + "lastModified": 1752256062, + "narHash": "sha256-2s0PrY3vIFusm4UrqPnskY6SgdVolEDAz9wHcCSadcw=", "owner": "nix-community", "repo": "home-manager", - "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312", + "rev": "b8b7e5ec3570eb003d55f4947dd39af15c3ca98d", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1763421233, - "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index 0f36555..0825709 100644 --- a/home.nix +++ b/home.nix @@ -19,14 +19,10 @@ home.packages = with pkgs; [ audacity - ardour beluga - bitwarden-desktop - cargo - catgirl + bitwarden clifm darktable - ffmpeg gimp godot hledger @@ -38,37 +34,26 @@ prismlauncher signal-desktop texliveFull - #unityhub vlc xournalpp - tor - tor-browser - weechat - xdg-desktop-portal-wlr ] ++ [ - atkinson-hyperlegible julia-mono - meslo-lgs-nf noto-fonts - noto-fonts-cjk-sans - noto-fonts-cjk-serif redhat-official-fonts - font-awesome overpass rubik roboto openmoji-black openmoji-color - ] - ; + ]; fonts.fontconfig = { enable = true; defaultFonts = { sansSerif = [ "Rubik" "Noto Sans" "DejaVu Sans" ]; serif = [ "Noto Serif" "DejaVu Serif" ]; - monospace = [ "juliaMono" ]; + monospace = [ "Noto Mono" ]; emoji = [ "OpenMoji" ]; }; }; @@ -102,9 +87,6 @@ # Notifications services.mako = { enable = true; - settings = { - default-timeout = 30000; - }; }; home.sessionVariables = { diff --git a/sway/sway.nix b/sway/sway.nix index c6818da..022d6d5 100644 --- a/sway/sway.nix +++ b/sway/sway.nix @@ -5,25 +5,13 @@ let (builtins.readFile ./chvol.sh); chbright = pkgs.writeShellScript "chbrights" (builtins.readFile ./chbright.sh); - multiTouchGesturesConfig = '' - bindgesture swipe:4:up focus parent - bindgesture swipe:4:left workspace prev - bindgesture swipe:4:right workspace next - bindgesture swipe:3:up focus up - bindgesture swipe:3:down focus down - bindgesture swipe:3:left focus left - bindgesture swipe:3:right focus right - ''; + in { home.packages = with pkgs; [ grim slurp wl-clipboard brightnessctl ]; - home.sessionVariables = { - NIXOS_OZONE_WL = "1"; - }; - wayland.windowManager.sway = { enable = true; config = { @@ -69,14 +57,7 @@ in { }; # GODOT IS A PAIN - extraConfig = " - for_window [class=\"^.*Godot.*$\"] floating enable - for_window [class=\"^.*Unity.*$\"] floating enable - " + - multiTouchGesturesConfig - + - ''output 'eDP-1' scale 1'' - ; + # extraConfig = "for_window [app_id=\"godot\"] border none"; };