From 74a84a8a96bd120db2223635cb55be7065d5a037 Mon Sep 17 00:00:00 2001 From: Rohan Deshpande Date: Wed, 11 Sep 2024 12:00:32 -0400 Subject: [PATCH] added i3status module --- flake.lock | 29 +++++++++++++++++++++++------ flake.nix | 4 +++- homeManagerModules/i3status.nix | 11 +++++++++++ homeManagerModules/texlive.nix | 5 ----- hosts/xps/configuration.nix | 1 + hosts/xps/home.nix | 9 +++++---- 6 files changed, 43 insertions(+), 16 deletions(-) create mode 100644 homeManagerModules/i3status.nix delete mode 100644 homeManagerModules/texlive.nix diff --git a/flake.lock b/flake.lock index cc10d4e..12bb830 100644 --- a/flake.lock +++ b/flake.lock @@ -317,11 +317,11 @@ ] }, "locked": { - "lastModified": 1725781935, - "narHash": "sha256-o6LRtdpgBTzev9n243Ktu3rn0/qsv0frFyJwU6vJsdE=", + "lastModified": 1725948275, + "narHash": "sha256-4QOPemDQ9VRLQaAdWuvdDBhh+lEUOAnSMHhdr4nS1mk=", "owner": "nix-community", "repo": "home-manager", - "rev": "ec4c6928bbacc89cf10e9c959a7a47cbaad95344", + "rev": "e5fa72bad0c6f533e8d558182529ee2acc9454fe", "type": "github" }, "original": { @@ -393,6 +393,22 @@ "type": "github" } }, + "nixos-hardware": { + "locked": { + "lastModified": 1725885300, + "narHash": "sha256-5RLEnou1/GJQl+Wd+Bxaj7QY7FFQ9wjnFq1VNEaxTmc=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "166dee4f88a7e3ba1b7a243edb1aca822f00680e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixos-hardware", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1725634671, @@ -454,11 +470,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1725792944, - "narHash": "sha256-8koegiii1xpr24cbyW2ohukw+zv06CVxR4YMC1aq7kE=", + "lastModified": 1726000537, + "narHash": "sha256-Y1dEuf2wZkg2rhE8sf73x9K0zknUald4Ia6zXnGEfjg=", "owner": "nix-community", "repo": "nixvim", - "rev": "2de406d9722fd2c69641e8347641c4a655586956", + "rev": "fc7e9b29271a03459191955f78d4128451b7cd81", "type": "github" }, "original": { @@ -492,6 +508,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixvim": "nixvim", "stylix": "stylix" diff --git a/flake.nix b/flake.nix index e6c8092..a27c8da 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,7 @@ # inputs.nixpkgs.follows = "nixpkgs"; }; stylix.url = "github:danth/stylix"; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; # home-manager = { # url = "github:nix-community/home-manager"; @@ -17,7 +18,7 @@ # }; }; - outputs = { self, nixpkgs, home-manager, nixvim, stylix, ... }@inputs: { + outputs = { self, nixpkgs, home-manager, nixvim, stylix, nixos-hardware, ... }@inputs: { nixosConfigurations.surface = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = {inherit inputs;}; @@ -42,6 +43,7 @@ system = "x86_64-linux"; specialArgs = {inherit inputs;}; modules = [ + nixos-hardware.nixosModules.dell-xps-15-9500-nvidia ./hosts/xps/configuration.nix stylix.nixosModules.stylix home-manager.nixosModules.home-manager diff --git a/homeManagerModules/i3status.nix b/homeManagerModules/i3status.nix new file mode 100644 index 0000000..6a5ba09 --- /dev/null +++ b/homeManagerModules/i3status.nix @@ -0,0 +1,11 @@ +{config, pkgs, ...}: { + programs.i3status = { + enable = true; + general = { + colors = true; + color_good = "#98971a"; + color_degraded = "#d79921"; + color_bad = "#cc241d"; + }; + }; +} diff --git a/homeManagerModules/texlive.nix b/homeManagerModules/texlive.nix deleted file mode 100644 index e23c29d..0000000 --- a/homeManagerModules/texlive.nix +++ /dev/null @@ -1,5 +0,0 @@ -{config, pkgs, ...}: { - programs.texlive = { - enable = true; - }; -} diff --git a/hosts/xps/configuration.nix b/hosts/xps/configuration.nix index b890f97..2fd36c0 100644 --- a/hosts/xps/configuration.nix +++ b/hosts/xps/configuration.nix @@ -77,6 +77,7 @@ firefox pulsemixer brightnessctl + lm_sensors ]; environment.sessionVariables = { NIXOS_OZONE_WL = "1"; diff --git a/hosts/xps/home.nix b/hosts/xps/home.nix index 19a51dc..abc3bb1 100644 --- a/hosts/xps/home.nix +++ b/hosts/xps/home.nix @@ -9,8 +9,8 @@ ./../../homeManagerModules/htop.nix ./../../homeManagerModules/lf.nix ./../../homeManagerModules/pandoc.nix - ./../../homeManagerModules/texlive.nix ./../../homeManagerModules/bat.nix + ./../../homeManagerModules/i3status.nix ]; # Home Manager needs a bit of information about you and the # paths it should manage. @@ -28,7 +28,6 @@ home.stateVersion = "24.05"; home.packages = with pkgs; [ autotiling - i3status fastfetch nix-tree sway-contrib.grimshot @@ -39,6 +38,7 @@ # }) obsidian vesktop + texlive.combined.scheme-basic ]; @@ -47,9 +47,9 @@ programs.zsh = { enable = true; enableSyntaxHighlighting = true; - loginExtra = "sway"; + loginExtra = "sway --unsupported-gpu"; shellAliases = { - "update" = "sudo nixos-rebuild switch --flake /home/rohand/nixos-surface-config#surface"; + "update" = "sudo nixos-rebuild switch --flake /home/rohand/nixos-surface-config#xps"; }; oh-my-zsh = { enable = true; @@ -66,6 +66,7 @@ programs.ranger = { enable = true; }; + programs.helix.enable = true; wayland.windowManager.sway = { enable = true; config = rec {