diff --git a/configuration.nix b/configuration.nix index 66fbc66..cc10179 100644 --- a/configuration.nix +++ b/configuration.nix @@ -25,8 +25,6 @@ programs.niri.enable = true; - programs.adb.enable = true; - # Bootloader. boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; @@ -75,7 +73,13 @@ fileSystems."mnt/win" = { }; # Enable the X11 windowing system. You can disable this if you're only using the Wayland session. - services.xserver.enable = true; + services.xserver = { + enable = true; + desktopManager = { + xterm.enable = false; + xfce.enable = false; + }; + }; xdg.portal = { enable = true; @@ -88,10 +92,10 @@ fileSystems."mnt/win" = { default = [ "gtk" ]; }; niri = { - default = [ - "gtk" - "gnome" - ]; + # default = [ + # "gtk" + # "gnome" + # ]; "org.freedesktop.impl.portal.ScreenCast" = [ "gnome" ]; "org.freedesktop.impl.portal.Screenshot" = [ "gnome" ]; }; @@ -101,8 +105,10 @@ fileSystems."mnt/win" = { # Enable the KDE Plasma Desktop Environment. services.displayManager.sddm.enable = true; + services.displayManager.ly.enable = false; services.desktopManager.plasma6.enable = true; + # Configure keymap in X11 services.xserver = { xkb.layout = "us"; xkb.variant = ""; }; @@ -166,19 +172,11 @@ programs.nix-ld.enable = true; vim wget git - kitty tree - nodejs - gparted ntfs3g heroic wineWowPackages.stable - winetricks - spotify - #spicetify-cli sshfs - freetube - # anydesk devenv # sway @@ -206,8 +204,6 @@ hardware.amdgpu.opencl.enable = true; programs.steam = { enable = true; }; - - services.gnome.gnome-keyring.enable = true; programs.sway = { @@ -229,7 +225,7 @@ hardware.amdgpu.opencl.enable = true; # List services that you want to enable: - # Enable the OpenSSH daemon. services.openssh.enable = true; + services.openssh.enable = true; # Open ports in the firewall. networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; Or disable the firewall altogether. diff --git a/flake.lock b/flake.lock index 5e82d7d..7812240 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1765990358, - "narHash": "sha256-l8x0gU8mnYaGMl+gWrsSHKBJlZWD8KXJfHTkRlFiPI0=", + "lastModified": 1767750947, + "narHash": "sha256-zqe9esphlAFu19TGL/nAyOHyOiR+Vu8M2IWWLg9cm4U=", "owner": "catppuccin", "repo": "nix", - "rev": "de1b60ca45a578f59f7d84c8d338b346017b2161", + "rev": "e7135074fe2a3d17bee3c229b5a7d3da26f76ce8", "type": "github" }, "original": { @@ -132,11 +132,11 @@ ] }, "locked": { - "lastModified": 1765980955, - "narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=", + "lastModified": 1767802041, + "narHash": "sha256-ZhgbFGQGeJaZ/xkwyHlgUCeHuIdEDqugYkObPL0NCyo=", "owner": "nix-community", "repo": "home-manager", - "rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173", + "rev": "bdaa3743831168787f528570f2b87963e72a2f23", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1765682243, - "narHash": "sha256-yeCxFV/905Wr91yKt5zrVvK6O2CVXWRMSrxqlAZnLp0=", + "lastModified": 1767104570, + "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=", "owner": "nix-community", "repo": "home-manager", - "rev": "58bf3ecb2d0bba7bdf363fc8a6c4d49b4d509d03", + "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf", "type": "github" }, "original": { @@ -183,7 +183,10 @@ }, "ndg": { "inputs": { - "nixpkgs": "nixpkgs_4" + "nixpkgs": [ + "nvf", + "nixpkgs" + ] }, "locked": { "lastModified": 1765720983, @@ -217,11 +220,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", + "lastModified": 1767116409, + "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", + "rev": "cad22e7d996aea55ecab064e84834289143e44a0", "type": "github" }, "original": { @@ -233,11 +236,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1765779637, - "narHash": "sha256-KJ2wa/BLSrTqDjbfyNx70ov/HdgNBCBBSQP3BIzKnv4=", + "lastModified": 1767640445, + "narHash": "sha256-UWYqmD7JFBEDBHWYcqE6s6c77pWdcU/i+bwD6XxMb8A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1306659b587dc277866c7b69eb97e5f07864d8c4", + "rev": "9f0c42f8bc7151b8e7e5840fb3bd454ad850d8c5", "type": "github" }, "original": { @@ -249,27 +252,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1764242076, - "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1764081664, - "narHash": "sha256-sUoHmPr/EwXzRMpv1u/kH+dXuvJEyyF2Q7muE+t0EU4=", + "lastModified": 1767364772, + "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc205f7b4fdb04c8b7877b43edb7b73be7730081", + "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa", "type": "github" }, "original": { @@ -279,13 +266,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { - "lastModified": 1765472234, - "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", + "lastModified": 1767379071, + "narHash": "sha256-EgE0pxsrW9jp9YFMkHL9JMXxcqi/OoumPJYwf+Okucw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", + "rev": "fb7944c166a3b630f177938e478f0378e64ce108", "type": "github" }, "original": { @@ -295,7 +282,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1765772535, "narHash": "sha256-I715zWsdVZ+CipmLtoCAeNG0etQywiWRE5PaWntnaYk=", @@ -308,13 +295,13 @@ "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { - "lastModified": 1765472234, - "narHash": "sha256-9VvC20PJPsleGMewwcWYKGzDIyjckEz8uWmT0vCDYK0=", + "lastModified": 1766902085, + "narHash": "sha256-coBu0ONtFzlwwVBzmjacUQwj3G+lybcZ1oeNSQkgC0M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fbfb1d73d239d2402a8fe03963e37aab15abe8b", + "rev": "c0b0e0fddf73fd517c3471e546c0df87a42d53f4", "type": "github" }, "original": { @@ -330,15 +317,15 @@ "flake-parts": "flake-parts", "mnw": "mnw", "ndg": "ndg", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "systems": "systems" }, "locked": { - "lastModified": 1765894398, - "narHash": "sha256-vZmKngMAaZ38mUjWeXavagrCE5f4h4s9yIShf2q75I4=", + "lastModified": 1767766515, + "narHash": "sha256-Hr87qJDIi4rL/d0njZYPyKDjtom6lDF3AV2UZL+K/fk=", "owner": "notashelf", "repo": "nvf", - "rev": "cd81bbb904571b538397d72a29e4c84b98480ee1", + "rev": "ceaae0eb2ece9e06159d6de80b0709e38d77f6a4", "type": "github" }, "original": { @@ -382,15 +369,15 @@ }, "spicetify-nix": { "inputs": { - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "systems": "systems_2" }, "locked": { - "lastModified": 1765687197, - "narHash": "sha256-5aJgT+lEC7ypuAGE3DQLj3LzYDQ+kRG6MnkVr3ZF9RU=", + "lastModified": 1767502559, + "narHash": "sha256-om0IPjW850vhhIrNZ5tiXjsYuqyoI44IdE+I9AwZ96I=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "fa6a5dde9d95bf7b8f075ff5aceeb1d97fa9043a", + "rev": "806c1fdeb7af3e013215d14f5d9f06685fa6650f", "type": "github" }, "original": { @@ -433,15 +420,15 @@ "inputs": { "crane": "crane", "flake-compat": "flake-compat_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1765998037, - "narHash": "sha256-nTqanCMNTE+SRYW1IHY/7BoGUEQbqmNN+zWCk6ANkR0=", + "lastModified": 1767801498, + "narHash": "sha256-BKzeTqSo1hTnxmjQSiQzERg2+NOYAHCibUVsQ49Ztgg=", "owner": "zed-industries", "repo": "zed", - "rev": "fa529b2ad272881aa45c66242ad02934cb22d624", + "rev": "69acab7f81950588ea0bb0ab73f4f28df1c05931", "type": "github" }, "original": { @@ -453,14 +440,14 @@ "zen-browser": { "inputs": { "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_8" + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1765946036, - "narHash": "sha256-R/qaIkzqm00qBMr8onM6ZZFX49lvsQLZ79adVubqjts=", + "lastModified": 1767763594, + "narHash": "sha256-5ysv8EuVAgDoYmNuXEUNf7vBzdeRaFxeIlIndv5HMvs=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "7db019a64483743a8d92319baafbbe71b687d0a1", + "rev": "8b2302d8c10369c9135552cc892da75cff5ddb03", "type": "github" }, "original": { diff --git a/packages/niri/config.kdl b/packages/niri/config.kdl index adee9cb..de2505b 100644 --- a/packages/niri/config.kdl +++ b/packages/niri/config.kdl @@ -374,7 +374,7 @@ binds { // Mod+M hotkey-overlay-title="Run an Application: rofi" { spawn "rofi" "-show" "drun"; } Super+Alt+L hotkey-overlay-title="Power menu" { spawn "rofi" "-show" "power-menu" "-modi" "power-menu:rofi-power-menu"; } Super+V hotkey-overlay-title="Clipboard history" { spawn "bash" "-c" "cliphist list | fuzzel -d | cliphist decode | wl-copy"; } - Super+E hotkey-overlay-title="Umlaute" { spawn "bash" "-c" "echo 'ä\nö\nü\nß\nÄ\nÖ\nÜ' | fuzzel -d | wl-copy"; } + Super+E hotkey-overlay-title="Umlaute" { spawn "bash" "-c" "echo 'aä\noö\nuü\nsß\nAÄ\nOÖ\nUÜ' | fuzzel -d | tr -d '\n aousAOU' | wl-copy"; } // You can also use a shell. Do this if you need pipes, multiple commands, etc. // Note: the entire command goes as a single argument in the end. diff --git a/packages/niri/default.nix b/packages/niri/default.nix index f8fba63..8cf299c 100644 --- a/packages/niri/default.nix +++ b/packages/niri/default.nix @@ -2,8 +2,8 @@ { home.packages = with pkgs; [ xwayland-satellite - xdg-desktop-portal-gtk - xdg-desktop-portal-gnome + # xdg-desktop-portal-gtk + # xdg-desktop-portal-gnome nautilus ]; diff --git a/packages/terminal/default.nix b/packages/terminal/default.nix index 747abd6..3867cc0 100644 --- a/packages/terminal/default.nix +++ b/packages/terminal/default.nix @@ -44,6 +44,8 @@ programs.zsh = { emacs = "emacs -nw"; femacs = "emacs -nw --load /home/n/Documents/Shells/flutter/init.el"; pemacs = "emacs -nw --load /home/n/Documents/Shells//python/init.el"; + dvu = "devenv up"; + dvs = "devenv shell"; }; initContent = '' diff --git a/packages/tmux/default.nix b/packages/tmux/default.nix index 90fdd2a..1e7020b 100644 --- a/packages/tmux/default.nix +++ b/packages/tmux/default.nix @@ -19,9 +19,9 @@ # newSession = true; extraConfig = '' -unbind C-b -set -g prefix C-Space -bind C-Space send-prefix +# unbind C-b +# set -g prefix C-t +# bind C-t send-prefix # vim-like pane resizing bind -r C-k resize-pane -U