diff --git a/home.nix b/home.nix index 0007c8c..e999308 100755 --- a/home.nix +++ b/home.nix @@ -3,104 +3,42 @@ imports = [ # ./users.nix + ./modules/hyprland.nix ]; programs.home-manager.enable = true; # Copy some files to where they go - - home.file.scripts = { - source = ./scripts; - target = ".local/bin/scripts"; - }; + # home.file.scripts = { + # source = ./scripts; + # target = ".local/bin/scripts"; + # }; # Installing muir packages uvu home.packages = with pkgs; [ # - Multimedia gimp - krita spotify - jellyfin-media-player + # jellyfin-media-player # - Web & Chat - lagrange schildichat-desktop # - Coding - gitui - vscodium + # vscodium + # gitui ]; # Configure muir programs - programs.gpg.enable = true; - # programs.firefox = import programs/firefox.nix pkgs; - programs.git = import programs/git.nix pkgs; - programs.topgrade = { - enable = false; - settings = { - misc = { - assume_yes = true; - pre_sudo = true; - disable = [ "system" "gnome_shell_extensions" "nix" ]; - }; - commands = { - "Upgrade System" = "nixos-upgrade -y"; - }; - post_commands = { - "Run Garbage Collection on Nix Store" = "nix-collect-garbage"; - }; - }; + + programs = { + gpg.enable = true; + direnv = { + enable = true; + nix-direnv.enable = true; + config.load_dotenv = false; + }; }; - programs.direnv = { - enable = true; - nix-direnv.enable = true; - config.load_dotenv = false; - }; - - # Configure Gnome shell juuuust right WIP - dconf.settings = { - "org/gnome/shell" = { - disable-user-extensions = false; - }; - "org/gnome/desktop/interface" = { - prefer-dark = true; - }; - "org/gnome/shell/keybindings" = { - toggle-message-tray = [ "m" ]; - }; - "org/gnome/desktop/input-sources" = { - xkb-options = [ "terminate:ctrl_alt_bksp" "compose:ralt" ]; - }; - "org/gtk/gtk4/settings/file-chooser" = { - sort-directories-first = true; - }; - # "org/gnome/desktop/background" = { - # picture-uri = "file:///home/sasha/.local/share/backgrounds/wallpaper.jpg"; - # picture-uri-dark = "file:///home/sasha/.local/share/backgrounds/wallpaper.jpg"; - # color-shading-type = "solid"; - # picture-options = "zoom"; - # primary-color = "#000000000000"; - # secondary-color = "#000000000000"; - # }; - # "org/gnome/desktop/screensaver" = { - # picture-uri = "file:///home/sasha/.local/share/backgrounds/wallpaper.jpg"; - # color-shading-type = "solid"; - # picture-options = "zoom"; - # primary-color = "#000000000000"; - # secondary-color = "#000000000000"; - # }; - # Pano settings - # "org/gnome/shell/extensions/pano" = { - # open-links-in-browser = false; - # paste-on-select = false; - # }; - # "org/gnome/shell/extensions/pano/text-item" = { - # header-bg-color = "rgb(97,53,131)"; - # body-bg-color = "rgb(36,31,49)"; - # body-color = "rgb(255,255,255)"; - # }; - }; - # don't uh, change this or something might break lol idk home.stateVersion = "23.11"; } diff --git a/modules/hyperland.nix b/modules/hyperland.nix new file mode 100644 index 0000000..018218d --- /dev/null +++ b/modules/hyperland.nix @@ -0,0 +1,34 @@ +{ pkgs, lib, osConfig, ... } + +{ + + wayland.windowManager.hyprland = { + enable = true; + settings = { + "$mod" = "SUPER"; + bind = + [ + "$mod, F, exec, firefox" + ", Print, exec, grimblast copy area" + ] + ++ ( + # workspaces + # binds $mod + [shift+] {1..10} to [move to] workspace {1..10} + builtins.concatLists (builtins.genList ( + x: let + ws = let + c = (x + 1) / 10; + in + builtins.toString (x + 1 - (c * 10)); + in [ + "$mod, ${ws}, workspace, ${toString (x + 1)}" + "$mod SHIFT, ${ws}, movetoworkspace, ${toString (x + 1)}" + ] + ) + 10) + ); + }; + }; + + +}