diff --git a/configuration.nix b/configuration.nix index e5bc49b..928eeb9 100644 --- a/configuration.nix +++ b/configuration.nix @@ -45,7 +45,7 @@ LC_TIME = "en_US.UTF-8"; }; - # Enable the X11 windowing system. + # Enable the X11 windowing sytem. services.xserver.enable = true; # Enable Plymouth @@ -54,6 +54,7 @@ }; # Enable the GNOME Desktop Environment. + services.xserver.desktopManager.plasma5.enable = true; services.xserver.displayManager.sddm.enable = true; services.xserver.displayManager.sddm.wayland.enable = true; programs.hyprland.enable = true; @@ -134,10 +135,14 @@ cava cosmic-session gnome.gnome-tweaks + libreoffice + hunspell + hunspellDicts.en_US cosmic-applets cosmic-settings cosmic-icons cosmic-protocols + neovide cosmic-design-demo flatpak rofi-wayland diff --git a/flake.lock b/flake.lock index 94f974a..2b00255 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ ] }, "locked": { - "lastModified": 1704982712, - "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "lastModified": 1706830856, + "narHash": "sha256-a0NYyp+h9hlb7ddVz4LUn1vT/PLwqfrWYcHMvFB1xYg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "rev": "b253292d9c0a5ead9bc98c4e9a26c6312e27d69f", "type": "github" }, "original": { @@ -84,11 +84,11 @@ ] }, "locked": { - "lastModified": 1706473109, - "narHash": "sha256-iyuAvpKTsq2u23Cr07RcV5XlfKExrG8gRpF75hf1uVc=", + "lastModified": 1707175763, + "narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=", "owner": "nix-community", "repo": "home-manager", - "rev": "d634c3abafa454551f2083b054cd95c3f287be61", + "rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80", "type": "github" }, "original": { @@ -105,11 +105,11 @@ ] }, "locked": { - "lastModified": 1706306660, - "narHash": "sha256-lZvgkHtVeduGByPb0Tz9LpAi4olfkEm8XPgv0o7GRsk=", + "lastModified": 1706955260, + "narHash": "sha256-W3y0j77IDVbmbajudHoUr46RpswujUCl+D5Vru53UsI=", "owner": "nix-community", "repo": "home-manager", - "rev": "b2f56952074cb46e93902ecaabfb04dd93733434", + "rev": "880d9bc2110f7cae59698f715b8ca42cdc53670c", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "master": { "locked": { - "lastModified": 1706737111, - "narHash": "sha256-cVqio8EZL1J7JqFKVay04TpJL6cpm68DqrqF0dsld+w=", + "lastModified": 1707331569, + "narHash": "sha256-4qcqSPZq5lpXnybVNe876EJRDyK9J5QsiL9800aCHM8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "939e432e4650d94bd5a179cad13f2ebcf7fc3c57", + "rev": "f3767a143e11491eed7401d5f5abf4f9150dc3c8", "type": "github" }, "original": { @@ -142,11 +142,11 @@ ] }, "locked": { - "lastModified": 1705915768, - "narHash": "sha256-+Jlz8OAqkOwJlioac9wtpsCnjgGYUhvLpgJR/5tP9po=", + "lastModified": 1706833576, + "narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "1e706ef323de76236eb183d7784f3bd57255ec0b", + "rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7", "type": "github" }, "original": { @@ -157,11 +157,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706550542, - "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "lastModified": 1707092692, + "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "rev": "faf912b086576fd1a15fca610166c98d47bc667e", "type": "github" }, "original": { @@ -182,11 +182,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1706539542, - "narHash": "sha256-Zbd9/0iTDNwf6ePvKkISvSMK6S7kmfsPzyG5f57sVA8=", + "lastModified": 1707312238, + "narHash": "sha256-grc7yArqgDBuRcMBsjOFD4GfSEYbyCKd/W3y0Gqm9wE=", "owner": "nix-community", "repo": "nixvim", - "rev": "37d124e94603f821b56072794c4800ad10252fd7", + "rev": "2e18333dd2c696241cde0f6aa0632738dff10c15", "type": "github" }, "original": { @@ -210,11 +210,11 @@ ] }, "locked": { - "lastModified": 1705757126, - "narHash": "sha256-Eksr+n4Q8EYZKAN0Scef5JK4H6FcHc+TKNHb95CWm+c=", + "lastModified": 1706424699, + "narHash": "sha256-Q3RBuOpZNH2eFA1e+IHgZLAOqDD9SKhJ/sszrL8bQD4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f56597d53fd174f796b5a7d3ee0b494f9e2285cc", + "rev": "7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 389c5df..623a8c4 100644 --- a/flake.nix +++ b/flake.nix @@ -17,13 +17,14 @@ nixosConfigurations = { nixos = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = {inherit master;}; + specialArgs = {inherit nixvim;}; modules = [ ./configuration.nix home-manager.nixosModules.home-manager { - specialArgs = {inherit nixvim;}; home-manager.useUserPackages = true; - home-manager.users.joshuaelm = import ./home.nix; + home-manager.users.joshuaelm = { + imports = [ ./home.nix nixvim.homeManagerModules.nixvim]; + }; } ]; }; diff --git a/home.nix b/home.nix index 39b08db..eca370e 100644 --- a/home.nix +++ b/home.nix @@ -24,11 +24,16 @@ xdg.configFile.waybar.source = ./modules/waybar; xdg.configFile.cava.source = ./modules/cava; xdg.configFile.kitty.source = ./modules/kitty; + xdg.configFile.rofi.source = ./modules/rofi; services.mpd-mpris.enable = true; gtk = { enable = true; + theme.package = pkgs.adw-gtk3; + theme.name = "adw-gtk3"; + iconTheme.package = pkgs.rose-pine-icon-theme; + iconTheme.name = "rose-pine-icons"; }; # This value determines the Home Manager release that your diff --git a/modules/nvim/default.nix b/modules/nvim/default.nix index bbdeb40..26c843a 100644 --- a/modules/nvim/default.nix +++ b/modules/nvim/default.nix @@ -1,7 +1,20 @@ -{config, pkgs, inputs, ...}: +{config, pkgs, lib, inputs, ...}: { - inputs.nixvim.homeManagerModules.nixvim= { + programs.nixvim = { enable = true; - }; + colorschemes.rose-pine.enable = true; + plugins.nvim-tree.enable = true; + plugins.treesitter.enable = true; + plugins.lualine.enable = true; + plugins.lsp.enable = true; + plugins.luasnip.enable = true; + plugins.toggleterm.enable = true; + plugins.nvim-cmp.enable = true; + plugins.gitsigns.enable = true; + plugins.which-key.enable = true; + plugins.cmp-nvim-lsp.enable = true; + plugins.telescope.enable = true; + plugins.indent-blankline.enable = true; + }; } diff --git a/modules/rofi/config.rasi b/modules/rofi/config.rasi new file mode 100644 index 0000000..6dfc4c2 --- /dev/null +++ b/modules/rofi/config.rasi @@ -0,0 +1,135 @@ +@import "default" + +* { + bg: #191724; + cur: #1f1d2e; + fgd: #e0def4; + cmt: #6e6a86; + cya: #9ccfd8; + grn: #31748f; + ora: #ebbcba; + pur: #c4a7e7; + red: #eb6f92; + yel: #f6c177; + + font: "Cartograph CF 12"; + + foreground: @fgd; + background: @bg; + active-background: @grn; + urgent-background: @red; + + selected-background: @active-background; + selected-urgent-background: @urgent-background; + selected-active-background: @active-background; + separatorcolor: @active-background; + bordercolor: @ora; +} + +#window { + background-color: @background; + border: 3; + border-radius: 6; + border-color: @bordercolor; + padding: 5; +} +#mainbox { + border: 0; + padding: 5; +} +#message { + border: 1px dash 0px 0px ; + border-color: @separatorcolor; + padding: 1px ; +} +#textbox { + text-color: @foreground; +} +#listview { + fixed-height: 0; + border: 2px dash 0px 0px ; + border-color: @bordercolor; + spacing: 2px ; + scrollbar: false; + padding: 2px 0px 0px ; +} +#element { + border: 0; + padding: 1px ; +} +#element.normal.normal { + background-color: @background; + text-color: @foreground; +} +#element.normal.urgent { + background-color: @urgent-background; + text-color: @urgent-foreground; +} +#element.normal.active { + background-color: @active-background; + text-color: @background; +} +#element.selected.normal { + background-color: @selected-background; + text-color: @foreground; +} +#element.selected.urgent { + background-color: @selected-urgent-background; + text-color: @foreground; +} +#element.selected.active { + background-color: @selected-active-background; + text-color: @background; +} +#element.alternate.normal { + background-color: @background; + text-color: @foreground; +} +#element.alternate.urgent { + background-color: @urgent-background; + text-color: @foreground; +} +#element.alternate.active { + background-color: @active-background; + text-color: @foreground; +} +#scrollbar { + width: 2px ; + border: 0; + handle-width: 8px ; + padding: 0; +} +#sidebar { + border: 2px dash 0px 0px ; + border-color: @separatorcolor; +} +#button.selected { + background-color: @selected-background; + text-color: @foreground; +} +#inputbar { + spacing: 0; + text-color: @foreground; + padding: 1px ; +} +#case-indicator { + spacing: 0; + text-color: @foreground; +} +#entry { + spacing: 0; + text-color: @cya; +} +#prompt { + spacing: 0; + text-color: @grn; +} +#inputbar { + children: [ prompt,textbox-prompt-colon,entry,case-indicator ]; +} +#textbox-prompt-colon { + expand: false; + str: ":"; + margin: 0px 0.3em 0em 0em; + text-color: @grn; +} diff --git a/modules/waybar/style.css b/modules/waybar/style.css index db50bcb..ddf1685 100644 --- a/modules/waybar/style.css +++ b/modules/waybar/style.css @@ -8,6 +8,7 @@ window#waybar { background-color: @base; + color: @text; margin: 0 4px; } window > box { @@ -34,6 +35,15 @@ window > box { margin-left: 5px; } +#workspaces.button { + color: @text; +} + +#workspaces.button.focused { + color: @overlay; + background-color: @text; +} + #clock { padding: 0 5px; margin-left: 5px; diff --git a/sddm-theme.nix b/sddm-theme.nix new file mode 100644 index 0000000..a614282 --- /dev/null +++ b/sddm-theme.nix @@ -0,0 +1,26 @@ +{ stdenvNoCC +, fetchFromGitHub +, libsForQt5 +}: + +stdenvNoCC.mkDerivation rec { + pname = "sddm-rose-pine-theme"; + version = "1.2"; + dontBuild = true; + + propagatedUserEnvPkgs = [ + libsForQt5.qt5.qtgraphicaleffects + ]; + + src = fetchFromGitHub { + owner = "lwndhrst"; + repo = "sddm-rose-pine"; + rev = "v${version}"; + sha256 = "+WOdazvkzpOKcoayk36VLq/6lLOHDWkDykDsy8p87JE="; + }; + + installPhase = '' + mkdir -p $out/share/sddm/themes + cp -aR $src $out/share/sddm/themes/rose-pine + ''; +}