diff --git a/hosts/default/.#arc-dark.nix b/hosts/default/.#arc-dark.nix new file mode 120000 index 0000000..54449f8 --- /dev/null +++ b/hosts/default/.#arc-dark.nix @@ -0,0 +1 @@ +liamm@nixos-laptop.2093:1710687812 \ No newline at end of file diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix index b0cb471..5a5cbf3 100644 --- a/hosts/default/configuration.nix +++ b/hosts/default/configuration.nix @@ -61,6 +61,7 @@ }; displayManager = { sddm.enable = true; + sdd.theme = "${import ../../modules/themes/sddm-theme.nix { inherit pkgs; }}"; sessionPackages = [ pkgs.hyprland ]; }; windowManager.i3.enable = true; @@ -89,12 +90,15 @@ (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" ]; }) ]; - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "steam" - "steam-original" - "steam-run" - "discord-0.0.44" - ]; +# This is my `configuration.nix` + + nixpkgs.config.allowUnfree = true; + # nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + # "steam" + # "steam-original" + # "steam-run" + # ]; + nix.settings.trusted-users = [ "root" "@wheel" ]; nix.gc = { @@ -112,6 +116,8 @@ description = "liamm"; extraGroups = [ "networkmanager" "wheel" ]; # Enable ‘sudo’ for the user. }; + + programs.dconf.enable = true; programs.steam = { enable = true; remotePlay.openFirewall = true; @@ -129,9 +135,10 @@ 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 + spotify + discord wl-clipboard alacritty - discord ]; @@ -139,6 +146,7 @@ hardware.system76.enableAll = true; services.auto-cpufreq.enable = true; + # services.flatpak.enable = true; services.thermald.enable = true; zramSwap = { @@ -147,6 +155,10 @@ }; xdg.mime.enable = true; + xdg.portal = { + enable = true; + wlr.enable = true; + }; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. diff --git a/hosts/default/home.nix b/hosts/default/home.nix index a5d8a77..08a8107 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -13,18 +13,20 @@ # environment. home.packages = [ + pkgs.brave pkgs.brightnessctl - pkgs.cmake + # pkgs.cmake pkgs.contour # pkgs.etcher ## Currently Uses Electron-19 -- which is marked EOL # pkgs.discord pkgs.emacs-all-the-icons-fonts pkgs.exfatprogs pkgs.firefox + # pkgs.flatpak pkgs.floorp - pkgs.gcc + # pkgs.gcc pkgs.grimblast - pkgs.gnumake + # pkgs.gnumake pkgs.htop pkgs.keepassxc pkgs.libtool @@ -36,6 +38,7 @@ pkgs.pavucontrol pkgs.picom pkgs.signal-desktop + # pkgs.spotify pkgs.swayidle pkgs.swww pkgs.thunderbird @@ -67,6 +70,31 @@ # Let Home Manager install and manage itself. programs.home-manager.enable = true; + # THEMING + + ## QT SECTION + qt.enable = true; + qt.platformTheme = "gtk"; + qt.style.name = "adwaita-dark"; + + ## GTK SECTION + gtk = { + enable = true; + cursorTheme = { + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Ice"; + }; + theme = { + name = "Matera-dark"; + package = pkgs.materia-theme; + }; + iconTheme = { + package = pkgs.arc-icon-theme; + name = "arc-icon-theme"; + }; + }; + + # ENV SETTINGS fonts.fontconfig = { @@ -223,8 +251,6 @@ defaultCacheTtl = 1800; enableSshSupport = true; }; - services.swayidle.enable = true; - #xdg.portal.enable = true; - #xdg.portal.wlr.enable = true; #services.nexcloud-client.enable = true; + services.swayidle.enable = true; } diff --git a/hosts/default/sddm-theme.nix b/hosts/default/sddm-theme.nix new file mode 100644 index 0000000..66a9672 --- /dev/null +++ b/hosts/default/sddm-theme.nix @@ -0,0 +1,24 @@ +{ pkgs }: + +let + imgLink = "https://github.com/Liam-Malone/nixos/modules/backgrounds/desert.jpg"; + image = pkgs.fetchurl { + url = imgLink; + sha256 = ""; + }; +in +pkgs.stdenv.mkDerivation { + name = "sddm-theme"; + src = pkgs.fetchFromGitHub { + owner = "nautilor"; + repo = "nord-sddm"; + rev = "ad72c3c7048c8aabe85bab41cbeab5f3c4502250"; + sha256 = "02idn5hggbqc0j01vhxij5nh748sgva123103d5ir0nl676rl782"; + }; + installPhase = '' + mkdir -p $out + cp -R ./* $out + rm Background.jpg + cp -r ${image} $out/Background.jpg + ''; +} diff --git a/modules/backgrounds/desert.jpg b/modules/backgrounds/desert.jpg new file mode 100644 index 0000000..1e3c7f0 Binary files /dev/null and b/modules/backgrounds/desert.jpg differ diff --git a/modules/themes/sddm-theme.nix b/modules/themes/sddm-theme.nix new file mode 100644 index 0000000..229a006 --- /dev/null +++ b/modules/themes/sddm-theme.nix @@ -0,0 +1,15 @@ +{ pkgs }: + +pkgs.stdenv.mkDerivation { + name = "sddm-theme"; + src = pkgs.fetchFromGitHub { + owner = "nautilor"; + repo = "nord-sddm"; + rev = "ad72c3c7048c8aabe85bab41cbeab5f3c4502250"; + sha256 = "02idn5hggbqc0j01vhxij5nh748sgva123103d5ir0nl676rl782"; + }; + installPhase = '' + mkdir -p $out + cp -R ./* $out + ''; +}