diff options
| -rw-r--r-- | compositor.nix | 39 | ||||
| -rw-r--r-- | configuration.nix | 13 | ||||
| -rw-r--r-- | flake.lock | 4 | ||||
| -rw-r--r-- | flake.nix | 1 | ||||
| -rw-r--r-- | gaming.nix | 1 | ||||
| -rw-r--r-- | home-manager.nix | 7 | ||||
| -rw-r--r-- | packages.nix | 7 | ||||
| -rw-r--r-- | services.nix | 44 |
8 files changed, 45 insertions, 71 deletions
diff --git a/compositor.nix b/compositor.nix new file mode 100644 index 0000000..ced8063 --- /dev/null +++ b/compositor.nix @@ -0,0 +1,39 @@ +# https://wiki.nixos.org/wiki/Sway +{ pkgs, ... }: +{ + environment.systemPackages = with pkgs; [ + grim + slurp + wl-clipboard + mako + ]; + + services.gnome.gnome-keyring.enable = true; + + programs.sway = { + enable = true; + wrapperFeatures.gtk = true; + }; + + services.greetd = { + enable = true; + settings = { + default_session = { + command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd sway"; + user = "greeter"; + }; + }; + }; + + systemd.user.services.kanshi = { + description = "kanshi daemon"; + environment = { + WAYLAND_DISPLAY="wayland-1"; + DISPLAY=":0"; + }; + serviceConfig = { + Type = "simple"; + ExecStart = ''${pkgs.kanshi}/bin/kanshi -c kanshi_config_file''; + }; + }; +} diff --git a/configuration.nix b/configuration.nix index 17aceae..6233580 100644 --- a/configuration.nix +++ b/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ lib, config, pkgs, ... }: +{ pkgs, ... }: { nix.settings.experimental-features = [ "nix-command" "flakes" ]; @@ -11,17 +11,6 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; - hardware.nvidia = { - modesetting.enable = true; - powerManagement.enable = false; - powerManagement.finegrained = false; - open = false; - nvidiaSettings = true; - nvidiaPersistenced = true; - - package = config.boot.kernelPackages.nvidiaPackages.stable; - }; - security.rtkit.enable = true; # Set your time zone. @@ -125,8 +125,8 @@ "zen-browser": "zen-browser" }, "locked": { - "lastModified": 1729708356, - "narHash": "sha256-atLIobjmPqHrUdGBD5yuaDtNGQwiepnlgJj7ukiz6sY=", + "lastModified": 1729794495, + "narHash": "sha256-ott5HtGCwQo9LkTsK4SPgW0Gb/Io6vZpHhnRy2S5KfU=", "path": "/home/jras/home-manager", "type": "path" }, @@ -19,6 +19,7 @@ ./keyd.nix ./services.nix ./packages.nix + ./compositor.nix home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; @@ -6,7 +6,6 @@ services.sunshine = { enable = true; autoStart = true; - capSysAdmin = true; openFirewall = true; settings = { output_name = 1; diff --git a/home-manager.nix b/home-manager.nix deleted file mode 100644 index 67ba932..0000000 --- a/home-manager.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ config, pkgs, ...}: { - home-manager.users.jras = { pkgs, ... }: { - imports = ["/home/jras/home-manager/common.nix"]; - - home.stateVersion = "24.05"; - }; -} diff --git a/packages.nix b/packages.nix index a21aa7a..d557a94 100644 --- a/packages.nix +++ b/packages.nix @@ -1,9 +1,4 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ config, pkgs, ... }: - +{ pkgs, ... }: { # List packages installed in system profile. To search, run: # $ nix search wget diff --git a/services.nix b/services.nix index 02947e1..ad4bfc5 100644 --- a/services.nix +++ b/services.nix @@ -1,9 +1,4 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ pkgs, ... }: - +{ ... }: { services.pipewire = { enable = true; @@ -11,41 +6,4 @@ alsa.support32Bit = true; pulse.enable = true; }; - - services.displayManager.defaultSession = "none+i3"; - services.displayManager.autoLogin.enable = true; - services.displayManager.autoLogin.user = "jras"; - services.xserver = { - enable = true; - videoDrivers = ["nvidia"]; - windowManager.i3 = { enable = true; - extraPackages = with pkgs; [ - dmenu - i3status - i3lock - i3blocks - ]; - }; - xkb = { - layout = "us"; - variant = "intl"; - }; - }; - - location.latitude = 52.49931951214914; - location.longitude = 4.816707180055415; - - services.redshift = { - enable = true; - - temperature = { - day = 5500; - night = 4500; - }; - - brightness = { - day = "0.8"; - night = "0.7"; - }; - }; } |