diff --git a/configuration.nix b/configuration.nix index d47c2b5..8be406c 100644 --- a/configuration.nix +++ b/configuration.nix @@ -2,16 +2,24 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, inputs, pkgs, dankMaterialShell, ... }: - +{ config, inputs, pkgs, dankMaterialShell, niri, ... }: { - imports = - [ # Include the results of the hardware scan. + imports = [ + # Include the results of the hardware scan. + # niri.nixosModules.niri dankMaterialShell.nixosModules.greeter /etc/nixos/hardware-configuration.nix - ]; + ]; - services.xserver.videoDrivers = [ "qemu" ]; + services.xserver = { + enable = true; + modules = [ pkgs.xorg.xf86videofbdev ]; + videoDrivers = [ + "hyperv_fb" + "qemu" + ]; + }; + #services.displayManager.sddm.enable = true; # Bootloader. boot.loader.systemd-boot.enable = true; @@ -57,6 +65,7 @@ description = "bangae1"; extraGroups = [ "networkmanager" "wheel" ]; packages = with pkgs; []; + shell = pkgs.fish; }; # Enable automatic login for the user. @@ -65,24 +74,41 @@ services.spice-vdagentd.enable = true; services.qemuGuest.enable = true; + xdg.mime.enable = true; + # Allow unfree packages nixpkgs.config.allowUnfree = true; # List packages installed in system profile. To search, run: # $ nix search wget + environment.systemPackages = with pkgs; [ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # wget git fish - xorg.xrandr + wlr-randr + xwayland-satellite + xdg-desktop-portal-gnome + xdg-desktop-portal-gtk + #niri.packages.${pkgs.system}.sessionPackage + nerd-fonts.jetbrains-mono + jetbrains-mono + kime ]; - environment.pathsToLink = [ - "/share/applications" + environment.pathsToLink = [ + "/share/applications" "/share/xdg-desktop-portal" ]; + environment.sessionVariables = { + GTK_IM_MODULE = "kime"; + QT_IM_MODULE = "kime"; + XMODIFIERS = "@im=kime"; + }; + + nix.settings.experimental-features = [ "nix-command" "flakes" ]; # Some programs need SUID wrappers, can be configured further or are @@ -92,6 +118,9 @@ # enable = true; # enableSSHSupport = true; # }; + #programs.niri.enable = true; + programs.fish.enable = true; + programs.firefox.enable = true; programs.nano.nanorc = '' set tabsize 2 @@ -103,11 +132,11 @@ compositor.name = "niri"; configHome = "/home/bangae1"; configFiles = [ - "/home/bangae1/DankMaterialShell/settings.json" + "/home/bangae1/.config/DankMaterialShell/settings.json" ]; }; - systemd.user.services.niri-flake-polkit.enable = false; + #systemd.user.services.niri-flake-polkit.enable = false; # List services that you want to enable: # Enable the OpenSSH daemon. diff --git a/niri.nix b/niri.nix index dcf609c..f5692d1 100644 --- a/niri.nix +++ b/niri.nix @@ -12,7 +12,7 @@ settings = { input.mod-key = "Alt"; outputs."Defualt" = { - #mode = "1920x1080"; + #mode = "1920x1080"; scale = 1; }; environment."NIXOS_OZONE_WL" = "1"; @@ -27,11 +27,12 @@ enableSpawn = true; }; systemd = { - enable = true; + # enable = true; restartIfChanged = true; }; }; + home.username = "bangae1"; home.homeDirectory = "/home/bangae1"; home.stateVersion = "25.05"; @@ -45,6 +46,6 @@ XDG_SESSION_DESKTOP = "niri"; }; - programs.zsh.enable = false; - programs.fish.enable = true; +# programs.zsh.enable = false; +# programs.fish.enable = true; }