voronind/nix
0
0
Fork 0
Code Issues 39 Pull requests Packages Projects Releases Wiki Activity

Lock : Update.

Browse source
This commit is contained in:
Dmitry Voronin 2024-05-24 03:43:20 +03:00 committed by Dmitry Voronin
parent 8256fa18cc
commit 36cea032be
Signed by: voronind
SSH key fingerprint: SHA256:3kBb4iV2ahufEBNq+vFbUe4QYfHt98DHQjN7QaptY9k
9 changed files with 122 additions and 88 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

116
flake.lock
View file

@ -149,16 +149,16 @@
"gnome-shell": { "gnome-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1698794309, "lastModified": 1713702291,
"narHash": "sha256-/TIkZ8y5Wv3QHLFp79Poao9fINurKs5pa4z0CRe+F8s=", "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=",
"owner": "GNOME", "owner": "GNOME",
"repo": "gnome-shell", "repo": "gnome-shell",
"rev": "a7c169c6c29cf02a4c392fa0acbbc5f5072823e7", "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "GNOME", "owner": "GNOME",
"ref": "45.1", "ref": "46.1",
"repo": "gnome-shell", "repo": "gnome-shell",
"type": "github" "type": "github"
} }
@ -170,11 +170,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1713818326, "lastModified": 1716457508,
"narHash": "sha256-aw3xbVPJauLk/bbrlakIYxKpeuMWzA2feGrkIpIuXd8=", "narHash": "sha256-ZxzffLuWRyuMrkVVq7wastNUqeO0HJL9xqfY1QsYaqo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "67de98ae6eed5ad6f91b1142356d71a87ba97f21", "rev": "850cb322046ef1a268449cf1ceda5fd24d930b05",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -191,11 +191,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1711915616, "lastModified": 1714981474,
"narHash": "sha256-co6LoFA+j6BZEeJNSR8nZ4oOort5qYPskjrDHBaJgmo=", "narHash": "sha256-b3/U21CJjCjJKmA9WqUbZGZgCvospO3ArOUTgJugkOY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "820be197ccf3adaad9a8856ef255c13b6cc561a6", "rev": "6ebe7be2e67be7b9b54d61ce5704f6fb466c536f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -256,11 +256,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1713714899, "lastModified": 1716330097,
"narHash": "sha256-+z/XjO3QJs5rLE5UOf015gdVauVRQd2vZtsFkaXBq2Y=", "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6143fc5eeb9c4f00163267708e26191d1e918932", "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -288,11 +288,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1713596654, "lastModified": 1714912032,
"narHash": "sha256-LJbHQQ5aX1LVth2ST+Kkse/DRzgxlVhTL1rxthvyhZc=", "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fd16bb6d3bcca96039b11aa52038fafeb6e4f4be", "rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -385,11 +385,11 @@
"nvimBufferline": { "nvimBufferline": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1713769392, "lastModified": 1716309007,
"narHash": "sha256-bHlmaNXfZTlTm/8v48FwCde9ljZFLv25efYF5355bnw=", "narHash": "sha256-u34PuwWmh0x2bbi4LM/JI3hx64tJ0vedfx5eEYAxRlM=",
"owner": "akinsho", "owner": "akinsho",
"repo": "bufferline.nvim", "repo": "bufferline.nvim",
"rev": "73540cb95f8d95aa1af3ed57713c6720c78af915", "rev": "73edc1f2732678e7a681e3d3be49782610914f6b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -417,11 +417,11 @@
"nvimColorizer": { "nvimColorizer": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1713519848, "lastModified": 1716475354,
"narHash": "sha256-jKVxjOD7oNLFgx4rGxWLRJ/8jpLvTfXzmPy6uHRIR/Q=", "narHash": "sha256-NxoNa3y0I2n0tUaqOHd8x468C/g3ayfJ49jmlB+5Tew=",
"owner": "brenoprata10", "owner": "brenoprata10",
"repo": "nvim-highlight-colors", "repo": "nvim-highlight-colors",
"rev": "432dc7a817a4973041f02b418169667c491f60fd", "rev": "c1042a5c86baad28346b27acbb15b7158d548047",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -433,11 +433,11 @@
"nvimDevicons": { "nvimDevicons": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1713675782, "lastModified": 1715644375,
"narHash": "sha256-AW2W6H7OTv52hfZCcYQc5UjFArBWKLeVclrwMt13HOM=", "narHash": "sha256-1trRSUVyWFl3K+7xHXQGNl/EwE0ggyigQpZ+kmRPsk8=",
"owner": "nvim-tree", "owner": "nvim-tree",
"repo": "nvim-web-devicons", "repo": "nvim-web-devicons",
"rev": "beb6367ab8496c9e43f22e0252735fdadae1872d", "rev": "e37bb1feee9e7320c76050a55443fa843b4b6f83",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -449,11 +449,11 @@
"nvimGitsigns": { "nvimGitsigns": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1713620636, "lastModified": 1716453598,
"narHash": "sha256-UK3DyvrQ0kLm9wrMQ6tLDoDunoThbY/Yfjn+eCZpuMw=", "narHash": "sha256-TTC3uvRsq4v6PBdS/3YAGpyhVt0w3/SGkPE3fu1zW94=",
"owner": "lewis6991", "owner": "lewis6991",
"repo": "gitsigns.nvim", "repo": "gitsigns.nvim",
"rev": "035da036e68e509ed158414416c827d022d914bd", "rev": "cdfcd9d39d23c46ae9a040de2c6a8b8bf868746e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -465,11 +465,11 @@
"nvimGruvboxMaterial": { "nvimGruvboxMaterial": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1711551555, "lastModified": 1716143891,
"narHash": "sha256-a6rbmGB5WlGG2deEwo5e/anR1S35gfmAYc+sNxnHp5I=", "narHash": "sha256-yk3b/pLlY/PsVswWxeBKSaWPZJVeEir73ROKzc+uvqg=",
"owner": "sainnhe", "owner": "sainnhe",
"repo": "gruvbox-material", "repo": "gruvbox-material",
"rev": "80331fbbec9ba18590a17bc6b7d277d96c05c2b6", "rev": "aa8096277690db1e1807ec57812c2cf3d54bb37f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -497,11 +497,11 @@
"nvimLspconfig": { "nvimLspconfig": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1713878586, "lastModified": 1716498901,
"narHash": "sha256-lyBHBriaY3cffdEXFI0um0X2JWa4NLGFuMNgQ+vgTHc=", "narHash": "sha256-PMMqPDnq4Q8gWeKQ2WPE+pOf1R1G61wJ+bAWkHpQlzE=",
"owner": "neovim", "owner": "neovim",
"repo": "nvim-lspconfig", "repo": "nvim-lspconfig",
"rev": "94874383aea04f259a81cf9e40750be60d5bcb30", "rev": "b972e7154bc94ab4ecdbb38c8edbccac36f83996",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -529,11 +529,11 @@
"nvimPlenary": { "nvimPlenary": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1713788468, "lastModified": 1716230027,
"narHash": "sha256-orGs1npIGIk7MUYadatYrcEXygK7JTj6OqQwy2TLDn0=", "narHash": "sha256-5Jf2mWFVDofXBcXLbMa417mqlEPWLA+cQIZH/vNEV1g=",
"owner": "nvim-lua", "owner": "nvim-lua",
"repo": "plenary.nvim", "repo": "plenary.nvim",
"rev": "5129a3693c482fcbc5ab99a7706ffc4360b995a0", "rev": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -561,11 +561,11 @@
"nvimTelescope": { "nvimTelescope": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1713665692, "lastModified": 1716432083,
"narHash": "sha256-wlRiwT1TCtwPXnIwnzqa6ZABUzJYn+lSRyvkqe6Dbsw=", "narHash": "sha256-YQfhr7bmdRNVcQXSCPTHtgRNeUyOwPTjGJeUHkUAJHM=",
"owner": "nvim-telescope", "owner": "nvim-telescope",
"repo": "telescope.nvim", "repo": "telescope.nvim",
"rev": "7d1698f3d88b448e0639974248cc17f49b7b8acf", "rev": "5665d93988acfbb0747bdbf4f4cb583bcebc8930",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -577,11 +577,11 @@
"nvimTodo": { "nvimTodo": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1711553769, "lastModified": 1716400082,
"narHash": "sha256-BJNU01iTRDNrPv48fgiJRS+ouaHkoqw2AYXKDRgDzfw=", "narHash": "sha256-ZJp0emoHogSdhXPIH74MH4CznxhCmMbO243dqxAZMJo=",
"owner": "folke", "owner": "folke",
"repo": "todo-comments.nvim", "repo": "todo-comments.nvim",
"rev": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d", "rev": "e1549807066947818113a7d7ed48f637e49620d3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -593,11 +593,11 @@
"nvimTokyonight": { "nvimTokyonight": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1713855116, "lastModified": 1716316559,
"narHash": "sha256-vUEPbgDen3ubcyJZdWCgnChOo1T0LFvZI++8RgGGx1Y=", "narHash": "sha256-pgoKgQBBgy7iSbQnUc2GSTJzghJ1TKSOUsO5UC6i8KQ=",
"owner": "folke", "owner": "folke",
"repo": "tokyonight.nvim", "repo": "tokyonight.nvim",
"rev": "67afeaf7fd6ebba000633e89f63c31694057edde", "rev": "b9b494fa7f7bbf2fe0747b47fa290fb7a4eddcc7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -609,11 +609,11 @@
"nvimTree": { "nvimTree": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1713668329, "lastModified": 1715647490,
"narHash": "sha256-QEvHQcEAGkm5UKVLc1DYvEqs5/JFNrkEFKHFZpe5ZDE=", "narHash": "sha256-YqHAEztx6gEEm0GoDXC5djnIP030oGGRcskp8LPqVoc=",
"owner": "nvim-tree", "owner": "nvim-tree",
"repo": "nvim-tree.lua", "repo": "nvim-tree.lua",
"rev": "ae8e46e8fabb32fa3ae5319383ea2c8763f14caa", "rev": "2bc725a3ebc23f0172fb0ab4d1134b81bcc13812",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -625,11 +625,11 @@
"nvimTreesitter": { "nvimTreesitter": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1713858020, "lastModified": 1716478226,
"narHash": "sha256-2QJj34iNUk++ycuMSgGKNPeeFBl27qyKe+2H3631yb4=", "narHash": "sha256-av9Q4C4Li2hWGUAbzP3F9Gx8WId8wK41CcMXIuM3gmM=",
"owner": "nvim-treesitter", "owner": "nvim-treesitter",
"repo": "nvim-treesitter", "repo": "nvim-treesitter",
"rev": "dc71d94fe223763d28ab49ee3de4fd7081a84891", "rev": "298a9dd4f8a0d95b347a7ebd301849d8b0e3917e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -641,11 +641,11 @@
"nvimTrouble": { "nvimTrouble": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1711693365, "lastModified": 1716133735,
"narHash": "sha256-kIQ72fqAsiMF9jq0MzC6peaHJddYn5PRNXfYFHTQB5Q=", "narHash": "sha256-D3dqI4NRgEG4BCDLQ3ci9lgYxt90XyWDQXlk4/uuR6M=",
"owner": "folke", "owner": "folke",
"repo": "trouble.nvim", "repo": "trouble.nvim",
"rev": "b9cf677f20bb2faa2dacfa870b084e568dca9572", "rev": "a8264a65a0b894832ea642844f5b7c30112c458f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -713,11 +713,11 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1713821140, "lastModified": 1716456264,
"narHash": "sha256-/kGc9R01h8mTmZKhrVyGWaK/w9zgettmHIE3GZW8Khs=", "narHash": "sha256-s9Tyj5pEivl/AsvrpkUkfR1Iu3zHfXpviPfe4HbPJ5I=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "0fe277a3641a849478a94c7900c2d5a90609a306", "rev": "290c8aef476ce98fff9cefc059284429d561a085",
"type": "github" "type": "github"
}, },
"original": { "original": {

22
module/common/Locale.nix
View file

@ -3,15 +3,15 @@
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
# You can customize your Locale in detail like that. # You can customize your Locale in detail like that.
# i18n.extraLocaleSettings = { i18n.extraLocaleSettings = {
# LC_ADDRESS = "ru_RU.UTF-8"; LC_ADDRESS = "ru_RU.UTF-8";
# LC_IDENTIFICATION = "ru_RU.UTF-8"; LC_IDENTIFICATION = "ru_RU.UTF-8";
# LC_MEASUREMENT = "ru_RU.UTF-8"; LC_MEASUREMENT = "ru_RU.UTF-8";
# LC_MONETARY = "ru_RU.UTF-8"; LC_MONETARY = "ru_RU.UTF-8";
# LC_NAME = "ru_RU.UTF-8"; LC_NAME = "ru_RU.UTF-8";
# LC_NUMERIC = "ru_RU.UTF-8"; LC_NUMERIC = "ru_RU.UTF-8";
# LC_PAPER = "ru_RU.UTF-8"; LC_PAPER = "ru_RU.UTF-8";
# LC_TELEPHONE = "ru_RU.UTF-8"; LC_TELEPHONE = "ru_RU.UTF-8";
# LC_TIME = "ru_RU.UTF-8"; LC_TIME = "ru_RU.UTF-8";
# }; };
} }

4
module/common/nvim/module/config/Etc.nix
View file

@ -1,4 +1,4 @@
{ setting, ... }: { { setting, lib, ... }: {
text = '' text = ''
-- TODO: Add comments and separate files. -- TODO: Add comments and separate files.
vim.opt.clipboard = "unnamedplus" vim.opt.clipboard = "unnamedplus"
@ -26,7 +26,7 @@
vim.cmd("set list listchars=tab:>\\ ,trail:-,lead:.") vim.cmd("set list listchars=tab:>\\ ,trail:-,lead:.")
-- Relative line numbers. -- Relative line numbers.
vim.wo.relativenumber = ${toString(setting.nvim.editor.relativenumber)} vim.wo.relativenumber = ${lib.boolToString(setting.nvim.editor.relativenumber)}
-- Disable swap files. -- Disable swap files.
vim.opt.swapfile = false vim.opt.swapfile = false

10
module/desktop/sway/script/Monitor.nix
View file

@ -37,7 +37,15 @@
} }
function monbar() { function monbar() {
printf "{\"text\": \"󰍹\", \"tooltip\": \"Mon: $(_monstate) / Vrr: $(_vrrstate)\"}\n" local __monstate=$(_monstate)
local __vrrstate=$(_vrrstate)
local class=""
if [[ "''${__monstate}" = "off" ]] || [[ "''${__vrrstate}" = "on" ]]; then
class="modified"
fi
printf "{\"text\": \"󰍹\", \"tooltip\": \"Mon: ''${__monstate^} / Vrr: ''${__vrrstate^}\", \"class\": \"''${class}\"}\n"
} }
function _monstate() { function _monstate() {

2
module/desktop/waybar/config/default.nix
View file

@ -54,7 +54,7 @@ in {
"clock": { "clock": {
// "timezone": "America/New_York", // "timezone": "America/New_York",
"tooltip-format": "<big><tt>{calendar}</tt></big>", "tooltip-format": "<big><tt>{calendar}</tt></big>",
"format-alt": "{:%d %a %H:%M}" "format-alt": "{:%d %a %H:%M}",
}, },
"battery": { "battery": {
"states": { "states": {

1
module/desktop/waybar/style/Font.nix → module/desktop/waybar/style/Common.nix
View file

@ -3,6 +3,7 @@
* { * {
font-family: "${style.font.serif.name}", "Terminess Nerd Font Propo"; font-family: "${style.font.serif.name}", "Terminess Nerd Font Propo";
font-size: ${toString(style.font.size.desktop)}px; font-size: ${toString(style.font.size.desktop)}px;
color: #${style.color.fg.light};
} }
''; '';
} }

36
module/desktop/waybar/style/Plugin.nix
View file

@ -1,7 +1,6 @@
{ style, ... }: { { style, ... }: {
text = '' text = ''
#pulseaudio, #pulseaudio,
#tray,
#mpris, #mpris,
#cpu, #cpu,
#battery, #battery,
@ -22,7 +21,40 @@
} }
#tray { #tray {
padding-right: 12px; padding: 8px 12px 8px 24px;
}
#battery:hover,
#clock:hover,
#cpu:hover,
#custom-display:hover,
#custom-powerlimit:hover,
#custom-powersave:hover,
#language:hover,
#memory:hover,
#mpris:hover,
#pulseaudio:hover,
#temperature:hover,
#tray:hover,
#workspaces button:hover {
background-color: #ff0000;
}
#pulseaudio.muted,
#battery.critical,
#custom-display.modified {
border-top: ${toString(style.window.border)}px solid #${style.color.accent};
}
#workspaces button {
padding: 0 4px;
border-top: ${toString(style.window.border)}px solid transparent;
}
#workspaces button.focused {
border-top: ${toString(style.window.border)}px solid #${style.color.accent};
} }
''; '';
# background-color: rgba(${style.color.border-r},${style.color.border-g},${style.color.border-b},${toString(style.opacity.desktop)});
} }

7
module/desktop/waybar/style/Window.nix
View file

@ -1,8 +1,13 @@
{ style, ... }: { { style, ... }: {
text = '' text = ''
window#waybar { window#waybar {
background: rgba(0, 0, 0, 0);
}
.modules-left,
.modules-right,
.modules-center {
background-color: rgba(${style.color.bg-r},${style.color.bg-g},${style.color.bg-b},${toString(style.opacity.desktop)}); background-color: rgba(${style.color.bg-r},${style.color.bg-g},${style.color.bg-b},${toString(style.opacity.desktop)});
color: #${style.color.fg.light};
border: ${toString(style.window.border)}px solid rgba(${style.color.border-r},${style.color.border-g},${style.color.border-b},${toString(style.opacity.desktop)}); border: ${toString(style.window.border)}px solid rgba(${style.color.border-r},${style.color.border-g},${style.color.border-b},${toString(style.opacity.desktop)});
} }

12
module/desktop/waybar/style/Workspace.nix
View file

@ -1,12 +0,0 @@
{ style, ... }: {
text = ''
#workspaces button {
padding: 0 4px;
border-top: ${toString(style.window.border)}px solid transparent;
}
#workspaces button.focused {
border-top: ${toString(style.window.border)}px solid #${style.color.accent};
}
'';
}