diff options
| -rw-r--r-- | configuration.nix | 14 | ||||
| -rw-r--r-- | flake.lock | 34 | ||||
| -rw-r--r-- | flake.nix | 24 | ||||
| -rwxr-xr-x | home.nix | 5 | ||||
| -rwxr-xr-x | hypr/hyprland.conf | 2 | ||||
| -rwxr-xr-x | mango/config.conf | 15 | ||||
| -rw-r--r-- | modules/home-manager.nix | 6 | ||||
| -rw-r--r-- | modules/mango.nix | 2 |
8 files changed, 58 insertions, 44 deletions
diff --git a/configuration.nix b/configuration.nix index 37bdd8b..bedbe1a 100644 --- a/configuration.nix +++ b/configuration.nix @@ -73,6 +73,7 @@ nixpkgs.config.allowUnfree = true; + services.tailscale.enable = true; services.blueman.enable = true; services.logind.settings.Login = { HandlePowerKey = "ignore"; @@ -160,6 +161,7 @@ hyprshot trash-cli nh + mosh ]; fonts.packages = with pkgs; [ @@ -183,15 +185,17 @@ virtualisation.libvirtd.enable = true; programs.virt-manager.enable = true; programs.nix-ld.enable = true; + programs.mango.enable = true; + programs.mango.addLoginEntry = true; programs.gnupg.agent = { enable = true; enableSSHSupport = true; pinentryPackage = pkgs.pinentry-gnome3; }; - programs.hyprland = { - enable = true; - xwayland.enable = true; - }; + # programs.hyprland = { + # enable = true; + # xwayland.enable = true; + # }; programs.firefox.enable = true; programs.thunar = { enable = true; @@ -218,7 +222,7 @@ }; services.power-profiles-daemon.enable = false; - services.desktopManager.cosmic.enable = true; + # services.desktopManager.cosmic.enable = true; services.gvfs.enable = true; services.tumbler.enable = true; services.openssh.enable = true; @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1768131442, - "narHash": "sha256-X+2RxD4+F8LBqvJNRh6FduRLU4a2SnZQ8a9BCN6Ty1E=", + "lastModified": 1772058043, + "narHash": "sha256-m1cmQgb6tBcHkndKZ8BSsw6PRNJMG89FZwoYVOuKi34=", "owner": "AdnanHodzic", "repo": "auto-cpufreq", - "rev": "046af28ffb4d719e3c360b3986750f187866d4a8", + "rev": "5d600d710bb2aa331e1a4370e08476bcdea1cab5", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1768403989, - "narHash": "sha256-kyQ79xcrgdnP2Pl7IzPUDo9Rotb4FdmvUxSYy7GfsbY=", + "lastModified": 1772164835, + "narHash": "sha256-zRcwrZDeBfYipqv/7K7TqsfPb87LFU6b7JhoNUGSnvQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "df6eeded8516d70bd9ece2f0c6904d9df8f3c04b", + "rev": "2a39b0828bbffce0d73769a61e46e780488d098b", "type": "github" }, "original": { @@ -58,7 +58,7 @@ "type": "github" } }, - "mango": { + "mangowc": { "inputs": { "flake-parts": "flake-parts", "nixpkgs": [ @@ -67,26 +67,26 @@ "scenefx": "scenefx" }, "locked": { - "lastModified": 1768307119, - "narHash": "sha256-u3T+FP/HBp13zTP0ybiHTIlMTvJS7gbqWNrEHYEa06M=", + "lastModified": 1772119371, + "narHash": "sha256-kp3hyXicSV9q1DmeAYpIYKvX3sj7kmKSZP0yb/n5I9k=", "owner": "DreamMaoMao", - "repo": "mango", - "rev": "764eb44b9b7231842aaed18773ad2499e215a3bd", + "repo": "mangowc", + "rev": "835269f86bf8d1f1e05b386a6a548e7c7cae1547", "type": "github" }, "original": { "owner": "DreamMaoMao", - "repo": "mango", + "repo": "mangowc", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1768127708, - "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=", + "lastModified": 1771848320, + "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", + "rev": "2fc6539b481e1d2569f25f8799236694180c0993", "type": "github" }, "original": { @@ -114,14 +114,14 @@ "inputs": { "auto-cpufreq": "auto-cpufreq", "home-manager": "home-manager", - "mango": "mango", + "mangowc": "mangowc", "nixpkgs": "nixpkgs" } }, "scenefx": { "inputs": { "nixpkgs": [ - "mango", + "mangowc", "nixpkgs" ] }, @@ -9,8 +9,8 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - mango = { - url = "github:DreamMaoMao/mango"; + mangowc = { + url = "github:DreamMaoMao/mangowc"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -25,10 +25,11 @@ nixpkgs, home-manager, auto-cpufreq, - mango, + mangowc, ... - }: + }@inputs: let + inherit (nixpkgs) lib; system = "x86_64-linux"; pkgs = import nixpkgs { inherit system; @@ -40,13 +41,20 @@ { nixosConfigurations.anand-mini = nixpkgs.lib.nixosSystem { specialArgs = { - inherit home-manager mango; + inherit home-manager mangowc; }; modules = [ ./configuration.nix - ./modules/home-manager.nix - # ./modules/mango.nix - ./modules/lsp.nix + home-manager.nixosModules.home-manager + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + users.anand = import ./home.nix; + backupFileExtension = "hmbackup"; + }; + } + mangowc.nixosModules.mango auto-cpufreq.nixosModules.default ]; }; @@ -93,14 +93,15 @@ in dmenu-wayland lazysql lazygit - ripgrep-all + ripgrep fd imv libreoffice godot mgba unrar - chrome + chromium + nil ]; xdg.configFile = builtins.mapAttrs (name: subpath: { diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 4f847fa..e448bd4 100755 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -200,7 +200,7 @@ bindel = ,XF86MonBrightnessDown, exec, brillo -qU 5 ### WINDOWS AND WORKSPACES ### ############################## -windowrulev2 = float,class:com.github.hluk.copyq +# windowrulev2 = float,class:com.github.hluk.copyq cursor { sync_gsettings_theme = false diff --git a/mango/config.conf b/mango/config.conf index c0e1952..00dd941 100755 --- a/mango/config.conf +++ b/mango/config.conf @@ -1,7 +1,4 @@ # More option see https://github.com/DreamMaoMao/mango/wiki/ - -exec-once = "bash ~/dots/mango/autostart.sh" - # Window effect blur=0 blur_layer=0 @@ -100,7 +97,7 @@ disable_trackpad=0 tap_to_click=1 tap_and_drag=1 drag_lock=1 -trackpad_natural_scrolling=0 +trackpad_natural_scrolling=1 disable_while_typing=1 left_handed=0 middle_button_emulation=0 @@ -274,3 +271,13 @@ axisbind=SUPER,DOWN,viewtoright_have_client # layer rule layerrule=animation_type_open:zoom,layer_name:rofi layerrule=animation_type_close:zoom,layer_name:rofi + +# Autostart +exec=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=wlroots >/dev/null 2>&1 & +exec=swww-daemon >/dev/null 2>&1 & +exec=nm-applet >/dev/null 2>&1 & +exec=copyq >/dev/null 2>&1 & +exec=dunst >/dev/null 2>&1 & +exec=waybar -c /home/anand/dots/mango/waybar/config.jsonc -s /home/anand/dots/mango/waybar/style.css >/dev/null 2>&1 & +exec=swww img /home/anand/dots/mango/walls/wallpaper.jpg >/dev/null 2>&1 & +exec=xrdb .Xresources >/dev/null 2>&1 & diff --git a/modules/home-manager.nix b/modules/home-manager.nix index ff14931..f5269be 100644 --- a/modules/home-manager.nix +++ b/modules/home-manager.nix @@ -3,10 +3,4 @@ imports = [ home-manager.nixosModules.home-manager ]; - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - users.anand = import ../home.nix; - backupFileExtension = "hmbackup"; - }; } diff --git a/modules/mango.nix b/modules/mango.nix index 5ef2972..a09a345 100644 --- a/modules/mango.nix +++ b/modules/mango.nix @@ -1,7 +1,7 @@ { mango, ... }: { imports = [ - mango.nixosModules.mango + mangowc.nixosModules.default ]; programs.mango.enable = true; |