diff --git a/dotfiles/hypr/%hyprland.conf b/dotfiles/hypr/%hyprland.conf deleted file mode 100644 index e5f4322..0000000 --- a/dotfiles/hypr/%hyprland.conf +++ /dev/null @@ -1,4 +0,0 @@ -source = ~/.config/hypr/hyprland_config/variables.conf -source = ~/.config/hypr/hyprland_config/* - - diff --git a/dotfiles/hypr/hyprland.lua b/dotfiles/hypr/hyprland.lua index 570d4ac..59d9010 100644 --- a/dotfiles/hypr/hyprland.lua +++ b/dotfiles/hypr/hyprland.lua @@ -7,9 +7,3 @@ require("conf.startup") require("conf.style") require("conf.windowrules") require("conf.workspace") - --- For Noctalia Color templates -require("noctalia") - --- This loads Noctalia-generated Hyprland colors. -dofile("/home/afoucaultc/.config/hypr/noctalia/noctalia-colors.lua") diff --git a/dotfiles/hypr/hyprtoolkit.conf b/dotfiles/hypr/hyprtoolkit.conf deleted file mode 100644 index b933e34..0000000 --- a/dotfiles/hypr/hyprtoolkit.conf +++ /dev/null @@ -1,7 +0,0 @@ -background = rgba(010409ff) -base = rgba(010409ff) -text = rgba(c9d1d9ff) -alternate_base = rgba(161b22ff) -bright_text = rgba(010409ff) -accent = rgba(58a6ffff) -accent_secondary = rgba(bc8cffff) \ No newline at end of file diff --git a/dotfiles/hypr/noctalia.lua b/dotfiles/hypr/noctalia.lua deleted file mode 100644 index 43754cf..0000000 --- a/dotfiles/hypr/noctalia.lua +++ /dev/null @@ -1,33 +0,0 @@ --- Generated by Noctalia - -local primary = "rgb(7a88cf)" -local surface = "rgb(1f2335)" -local secondary = "rgb(d7729f)" -local error = "rgb(f7768e)" - -hl.config({ - general = { - col = { - active_border = primary, - inactive_border = surface, - }, - }, - - group = { - col = { - border_active = secondary, - border_inactive = surface, - border_locked_active = error, - border_locked_inactive = surface, - }, - - groupbar = { - col = { - active = secondary, - inactive = surface, - locked_active = error, - locked_inactive = surface, - }, - }, - }, -}) diff --git a/dotfiles/hypr/noctalia/noctalia-colors.conf b/dotfiles/hypr/noctalia/noctalia-colors.conf deleted file mode 100644 index bee4c80..0000000 --- a/dotfiles/hypr/noctalia/noctalia-colors.conf +++ /dev/null @@ -1,25 +0,0 @@ -$primary = rgb(58a6ff) -$surface = rgb(010409) -$secondary = rgb(bc8cff) -$error = rgb(f85149) -$tertiary = rgb(bc8cff) -$surface_lowest = rgb(05080e) - -general { - col.active_border = $primary - col.inactive_border = $surface -} - -group { - col.border_active = $secondary - col.border_inactive = $surface - col.border_locked_active = $error - col.border_locked_inactive = $surface - - groupbar { - col.active = $secondary - col.inactive = $surface - col.locked_active = $error - col.locked_inactive = $surface - } -} diff --git a/dotfiles/hypr/noctalia/noctalia-colors.lua b/dotfiles/hypr/noctalia/noctalia-colors.lua deleted file mode 100644 index 509c7b9..0000000 --- a/dotfiles/hypr/noctalia/noctalia-colors.lua +++ /dev/null @@ -1,35 +0,0 @@ --- Colors template generated by Noctalia --- Source command is: --- dofile(os.getenv("HOME") .. "/.config/hypr/noctalia/noctalia-colors.lua") - -local primary = "rgb(58a6ff)" -local surface = "rgb(010409)" -local secondary = "rgb(bc8cff)" -local error = "rgb(f85149)" - -hl.config({ - general = { - col = { - active_border = primary, - inactive_border = surface, - }, - }, - - group = { - col = { - border_active = secondary, - border_inactive = surface, - border_locked_active = error, - border_locked_inactive = surface, - }, - - groupbar = { - col = { - active = secondary, - inactive = surface, - locked_active = error, - locked_inactive = surface, - }, - }, - }, -}) diff --git a/dotfiles/nvim/lua/neoconf/lazy/base16.lua b/dotfiles/nvim/lua/neoconf/lazy/base16.lua new file mode 100644 index 0000000..49bad8a --- /dev/null +++ b/dotfiles/nvim/lua/neoconf/lazy/base16.lua @@ -0,0 +1,6 @@ +return { + { + "nvim-mini/mini.base16", + version = "*", + }, +} diff --git a/dotfiles/nvim/lua/neoconf/lazy/lavi.lua b/dotfiles/nvim/lua/neoconf/lazy/lavi.lua deleted file mode 100644 index c195d54..0000000 --- a/dotfiles/nvim/lua/neoconf/lazy/lavi.lua +++ /dev/null @@ -1,13 +0,0 @@ -return { - { - "b0o/lavi", - lazy = false, - priority = 1000, - config = function() - vim.g.lavi_config = { - transparent = true, - } - vim.cmd.colorscheme("lavi") - end, - }, -} diff --git a/dotfiles/nvim/lua/neoconf/settings.lua b/dotfiles/nvim/lua/neoconf/settings.lua index 3d1589a..194f87f 100644 --- a/dotfiles/nvim/lua/neoconf/settings.lua +++ b/dotfiles/nvim/lua/neoconf/settings.lua @@ -42,7 +42,5 @@ vim.o.confirm = true vim.opt.spell = true vim.opt.spelllang = "fr" -vim.o.background = "dark" -vim.cmd([[ colorscheme lavi ]]) -- others vim.g.python3_host_prog = "/usr/bin/python3" diff --git a/flake.lock b/flake.lock index 22328a0..f7da1f2 100644 --- a/flake.lock +++ b/flake.lock @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1783134515, - "narHash": "sha256-qMoZazubXlXUD9k/syJ/aiWC4X4g73mwVmZ7Z4+rdpM=", + "lastModified": 1783222121, + "narHash": "sha256-E/ElL373TO8lQ2aMvYyzN+k4xkVaUGoRqoa8AtM71tI=", "owner": "nix-community", "repo": "home-manager", - "rev": "b885baad531fa3d3beae2ba9a0712d22974d8016", + "rev": "a1645f40777620c4bd2b6d854b290c2fc354a266", "type": "github" }, "original": { @@ -322,11 +322,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1783110106, - "narHash": "sha256-PRnnFkTfQ+sQHSrcWw0512zEMNp5/1WHJeVuDf6FmxI=", + "lastModified": 1783198893, + "narHash": "sha256-UgdXpHgsg700hROak8RspFTfa/PDClxfyCEKs12nhxU=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "14fa1fd0273973b7a40966b4fa9e081d6bf67dae", + "rev": "7a5214614b2f5bec4dbe1d0bddbc128c79cd2dfb", "type": "github" }, "original": { @@ -985,11 +985,11 @@ ] }, "locked": { - "lastModified": 1783146259, - "narHash": "sha256-wWlTBOy/Q6mfqamF+Z/KE1NRwoGwX+iKHusxdc2qNs8=", + "lastModified": 1783190846, + "narHash": "sha256-UcdKHKcDxLxBon0HsOjDRRA7l1vVT28R83LkCIAlYYc=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "45617befee3b74b806f7a4f0e1f48e3b2abc91f3", + "rev": "0758bc86f7a55bbe002f0cede9e1a49e5a6e34d9", "type": "github" }, "original": { diff --git a/home/afoucaultc/dotfiles_apps.nix b/home/afoucaultc/dotfiles_apps.nix index 5c3a996..d3be0ae 100644 --- a/home/afoucaultc/dotfiles_apps.nix +++ b/home/afoucaultc/dotfiles_apps.nix @@ -17,7 +17,10 @@ config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos-config/dotfiles/rofi"; - xdg.configFile."nvim".source = ../../dotfiles/nvim; + # xdg.configFile."nvim".source = ../../dotfiles/nvim; + xdg.configFile."nvim".source = + config.lib.file.mkOutOfStoreSymlink + "${config.home.homeDirectory}/nixos-config/dotfiles/nvim"; xdg.configFile."hypr".source = config.lib.file.mkOutOfStoreSymlink diff --git a/home/afoucaultc/home-laptop.nix b/home/afoucaultc/home-laptop.nix index 7d176be..b7f3179 100644 --- a/home/afoucaultc/home-laptop.nix +++ b/home/afoucaultc/home-laptop.nix @@ -8,6 +8,7 @@ [ # modules partagés ./packages/firefox.nix + ./packages/thunderbird.nix ./packages/git.nix ./packages/hyprland.nix ./packages/neovim.nix diff --git a/home/afoucaultc/packages/lavi.nix b/home/afoucaultc/packages/lavi.nix deleted file mode 100644 index 5955f10..0000000 --- a/home/afoucaultc/packages/lavi.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ inputs, pkgs, ... }: -{ - imports = [ inputs.lavi.homeManagerModules.lavi ]; - - lavi = { - neovim.enable = true; # Adds lavi-nvim to programs.neovim.plugins - ghostty.enable = true; # Configures programs.ghostty.themes.lavi - alacritty.enable = true; # Merges colors into programs.alacritty.settings - bat.enable = true; # Installs tmTheme and sets bat theme to Lavi - kitty.enable = true; # Appends to programs.kitty.extraConfig - foot.enable = true; # Merges into programs.foot.settings - btop.enable = true; # Writes theme file and sets color_theme - bottom.enable = true; # Merges styles into programs.bottom.settings - clipse.enable = true; # Merges theme into services.clipse.theme - dank-material-shell.enable = true; # Configures programs.dank-material-shell custom theme - opencode.enable = true; # Configures programs.opencode.themes.lavi - wezterm.enable = true; # Writes theme to wezterm/colors/ - zellij.enable = true; # Configures programs.zellij.themes.lavi - }; -} diff --git a/home/afoucaultc/packages/thunderbird.nix b/home/afoucaultc/packages/thunderbird.nix index 4c68066..8677f85 100644 --- a/home/afoucaultc/packages/thunderbird.nix +++ b/home/afoucaultc/packages/thunderbird.nix @@ -6,6 +6,4 @@ isDefault = true; }; }; - - stylix.targets.thunderbird.enable = true; }