diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 54bd5d1..dd3da8d 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,35 +1,35 @@ { - "LuaSnip": { "branch": "master", "commit": "21f74f7ba8c49f95f9d7c8293b147c2901dd2d3a" }, + "LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" }, "barbar.nvim": { "branch": "master", "commit": "549ee11d97057eae207bafa2c23c315942cca097" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, - "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" }, - "fidget.nvim": { "branch": "main", "commit": "4d5858bd4c471c895060e1b9f3575f1551184dc5" }, + "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" }, + "fidget.nvim": { "branch": "main", "commit": "2cb5edb2dd6700a958a446b20bb2be04d318da9d" }, "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, "luau-lsp.nvim": { "branch": "main", "commit": "6c80704a4768c31e4c8e87180c9bae79343b169d" }, - "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "5e085efe67fccb13372d54331d849219662a7e93" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "7f0bf635082bb9b7d2b37766054526a6ccafdb85" }, "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, - "mini.nvim": { "branch": "main", "commit": "e7538b549361c9ac8416a07b0223ce03c508bfe7" }, - "neovim": { "branch": "main", "commit": "72a04c4065345b51b56aed4859ea1d884f734097" }, + "mini.nvim": { "branch": "main", "commit": "5d938b3a078a7eeae23ba9f04f180066ab8bd9ef" }, + "neovim": { "branch": "main", "commit": "72befaffeac38db7bdd49e0549eaa2c4806dd878" }, "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-lspconfig": { "branch": "master", "commit": "3e89e4973d784e1c966517e528b3a30395403fa7" }, + "nvim-highlight-colors": { "branch": "main", "commit": "e0c4a58ec8c3ca7c92d3ee4eb3bc1dd0f7be317e" }, + "nvim-lspconfig": { "branch": "master", "commit": "a6dbc91d9ae373a87bcd9e3c15853e309691c39b" }, "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, - "nvim-tree.lua": { "branch": "master", "commit": "fefa335f1c8f690eb668a1efd18ee4fc6d64cd3e" }, + "nvim-tree.lua": { "branch": "master", "commit": "f0e9951778802526b14c934f7bf746e1e0ae5ed0" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, - "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" }, + "nvim-web-devicons": { "branch": "master", "commit": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "telescope-tabs": { "branch": "master", "commit": "777b1f630f3d6a12a2e71635a82581c988d6da2e" }, + "telescope-tabs": { "branch": "master", "commit": "d16fae006ba978ccc5c5579d40f358e12a0f8d30" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, - "undotree": { "branch": "master", "commit": "fe9a9d0645f0f5532360b5e5f5c550d7bb4f1869" }, + "undotree": { "branch": "master", "commit": "28f2f54a34baff90ea6f4a735ef1813ad875c743" }, "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" } } diff --git a/.config/nvim/lua/rocketcamel/plugins/theme.lua b/.config/nvim/lua/rocketcamel/plugins/theme.lua index 36c477b..3da4397 100644 --- a/.config/nvim/lua/rocketcamel/plugins/theme.lua +++ b/.config/nvim/lua/rocketcamel/plugins/theme.lua @@ -1,12 +1,18 @@ return { - { - "rose-pine/neovim", - dependencies = { - "nvim-tree/nvim-web-devicons", - }, - config = function() - require("rose-pine").setup() - vim.cmd.colorscheme("rose-pine") - end, - }, + { + "rose-pine/neovim", + dependencies = { + "nvim-tree/nvim-web-devicons", + }, + config = function() + require("rose-pine").setup() + vim.cmd.colorscheme("rose-pine") + end, + }, + { + "brenoprata10/nvim-highlight-colors", + config = function() + require("nvim-highlight-colors").setup({}) + end, + }, } diff --git a/nix/flake.lock b/nix/flake.lock index 022336c..9cfb61b 100644 --- a/nix/flake.lock +++ b/nix/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1744557573, - "narHash": "sha256-XAyj0iDuI51BytJ1PwN53uLpzTDdznPDQFG4RwihlTQ=", + "lastModified": 1764289441, + "narHash": "sha256-ak+lgFiYE5PHByN1/BRkO5JP498hno6Ix24C1Qf/vec=", "owner": "aylur", "repo": "ags", - "rev": "3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6", + "rev": "e169694390548dfd38ff40f1ef2163d6c3ffe3ea", "type": "github" }, "original": { @@ -31,11 +31,11 @@ ] }, "locked": { - "lastModified": 1742571008, - "narHash": "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=", + "lastModified": 1764173295, + "narHash": "sha256-Jh4VtPcK2Ov+RTcV9FtyQRsxiJmXFQGfqX6jjM7/mgc=", "owner": "aylur", "repo": "astal", - "rev": "dc0e5d37abe9424c53dcbd2506a4886ffee6296e", + "rev": "7d1fac8a4b2a14954843a978d2ddde86168c75ef", "type": "github" }, "original": { @@ -83,16 +83,16 @@ ] }, "locked": { - "lastModified": 1758463745, - "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=", + "lastModified": 1764866045, + "narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=", "owner": "nix-community", "repo": "home-manager", - "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3", + "rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-25.05", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -135,16 +135,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1759994382, - "narHash": "sha256-wSK+3UkalDZRVHGCRikZ//CyZUJWDJkBDTQX1+G77Ow=", + "lastModified": 1764677808, + "narHash": "sha256-H3lC7knbXOBrHI9hITQ7modLuX20mYJVhZORL5ioms0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5da4a26309e796daa7ffca72df93dbe53b8164c7", + "rev": "1aab89277eb2d87823d5b69bae631a2496cff57a", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -187,11 +187,11 @@ ] }, "locked": { - "lastModified": 1758773488, - "narHash": "sha256-eGQ7uMfx4LTjYF+65wKVgKZ6aGTx8K+uuo4Gf4bBYAw=", + "lastModified": 1764912341, + "narHash": "sha256-H2+bdvsbDqj/9Zv0ndlfgV/8p78L28elIkXzoJxiIbQ=", "owner": "rocketcamel", "repo": "dotfiles-status-bar", - "rev": "68142eac7c2ca97a9bfa79fef82982b89c74f9cb", + "rev": "1759e2d976b0df678db33040f6fa832e7a05ecd4", "type": "github" }, "original": { diff --git a/nix/flake.nix b/nix/flake.nix index a14b01c..4f61035 100644 --- a/nix/flake.nix +++ b/nix/flake.nix @@ -2,10 +2,10 @@ description = "Top level flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-25.05"; + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-25.11"; nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; - home-manager.url = "github:nix-community/home-manager?ref=release-25.05"; + home-manager.url = "github:nix-community/home-manager?ref=release-25.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; custom-fonts.url = "path:./fonts"; diff --git a/nix/modules/commonPackages.nix b/nix/modules/commonPackages.nix index daf4222..6af8574 100644 --- a/nix/modules/commonPackages.nix +++ b/nix/modules/commonPackages.nix @@ -11,7 +11,7 @@ fonts.packages = with pkgs; [ noto-fonts noto-fonts-cjk-sans - noto-fonts-emoji + noto-fonts-color-emoji liberation_ttf mplus-outline-fonts.githubRelease dina-font diff --git a/nix/modules/desktop.nix b/nix/modules/desktop.nix index 3b6ca85..5b6f347 100644 --- a/nix/modules/desktop.nix +++ b/nix/modules/desktop.nix @@ -66,7 +66,7 @@ programs.steam.enable = true; programs.obs-studio.enable = true; services.tumbler.enable = true; - services.xserver.displayManager.gdm = { + services.displayManager.gdm = { enable = true; wayland = true; }; @@ -148,17 +148,18 @@ }; services.hyprsunset = { enable = true; - transitions = { - sunrise = { - calendar = "*-*-* 06:00:00"; - }; - sunset = { - calendar = "*-*-* 20:00:00"; - requests = [ - [ "temperature 3500" ] - [ "gamma 0.8" ] - ]; - }; + settings = { + profile = [ + { + time = "6:00"; + identity = true; + } + { + time = "21:00"; + temperature = 3500; + gamma = 0.8; + } + ]; }; }; gtk = { diff --git a/nix/users/luca/git.nix b/nix/users/luca/git.nix index cc25595..936000d 100644 --- a/nix/users/luca/git.nix +++ b/nix/users/luca/git.nix @@ -1,13 +1,10 @@ { enable = true; - userName = "rocketcamel"; - userEmail = "luca_lise@icloud.com"; - signing = { - signByDefault = true; - format = "ssh"; - key = "~/.ssh/commits.id_ed25519.pub"; - }; - extraConfig = { + settings = { + user = { + name = "rocketcamel"; + email = "luca_lise@icloud.com"; + }; init = { defaultBranch = "main"; }; @@ -15,4 +12,9 @@ autoSetupRemote = true; }; }; + signing = { + signByDefault = true; + format = "ssh"; + key = "~/.ssh/commits.id_ed25519.pub"; + }; }